mirror of
https://github.com/YunoHost-Apps/guacamole_ynh.git
synced 2024-09-03 19:16:03 +02:00
Testing (#10)
* [autopatch] Update issue and PR templates (#6) Co-authored-by: Yunohost-Bot <> * Update to tomcat 9.0.31-1~deb10u4 (#8) * Update to tomcat 9.0.31-1~deb10u4 - It is annoying that older builds are getting removed from source server - Let's rename the downloaded archive to simplify the code * Silence make warnings * Bump package version Co-authored-by: YunoHost Bot <yunohost-bot@users.noreply.github.com>
This commit is contained in:
tituspijean
GitHub
parent
57cd4895cf
commit
114df1e934
7 changed files with 35 additions and 35 deletions
|
|
@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide
|
|||
1. *Read this whole template first.*
|
||||
2. *Determine if you are on the right place:*
|
||||
- *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
|
||||
- *Otherwise, the issue may be due to guacamole itself. Refer to its documentation or repository for help.*
|
||||
- *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
|
||||
- *When in doubt, post here and we will figure it out together.*
|
||||
3. *Delete the italic comments as you write over them below, and remove this guide.*
|
||||
---
|
||||
|
|
@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide
|
|||
|
||||
- *If you performed a command from the CLI, the command itself is enough. For example:*
|
||||
```sh
|
||||
sudo yunohost app install guacamole
|
||||
sudo yunohost app install the_app
|
||||
```
|
||||
- *If you used the webadmin, please perform the equivalent command from the CLI first.*
|
||||
- *If the error occurs in your browser, explain what you did:*
|
||||
16
.github/PULL_REQUEST_TEMPLATE.md
vendored
Normal file
16
.github/PULL_REQUEST_TEMPLATE.md
vendored
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
## Problem
|
||||
|
||||
- *Description of why you made this PR*
|
||||
|
||||
## Solution
|
||||
|
||||
- *And how do you fix that problem*
|
||||
|
||||
## PR Status
|
||||
|
||||
- [ ] Code finished and ready to be reviewed/tested
|
||||
- [ ] The fix/enhancement were manually tested (if applicable)
|
||||
|
||||
## Automatic tests
|
||||
|
||||
Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.31-1~deb10u3_all.deb
|
||||
SOURCE_SUM=0f51e6e84f4045564d6c3b249b69e1a7cb10a8f737458003da701b52a2903970
|
||||
SOURCE_URL=https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.31-1~deb10u4_all.deb
|
||||
SOURCE_SUM=42276CABAD11856553DD9265B8C7FBCCE245525BF80EAF180085AB74BB078619
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=ar
|
||||
SOURCE_IN_SUBDIR=false
|
||||
SOURCE_FILENAME=tomcat9_9.0.31-1~deb10u3_all.deb
|
||||
SOURCE_FILENAME=tomcat9.deb
|
||||
SOURCE_EXTRACT=false
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH.",
|
||||
"fr": "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH."
|
||||
},
|
||||
"version": "1.3.0~ynh3",
|
||||
"version": "1.3.0~ynh4",
|
||||
"url": "https://guacamole.apache.org/",
|
||||
"license": "Apache-2.0",
|
||||
"maintainer": {
|
||||
|
|
@ -54,4 +54,4 @@
|
|||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
## Problem
|
||||
- *Description of why you made this PR*
|
||||
|
||||
## Solution
|
||||
- *And how do you fix that problem*
|
||||
|
||||
## PR Status
|
||||
- [ ] Code finished.
|
||||
- [ ] Tested with Package_check.
|
||||
- [ ] Fix or enhancement tested.
|
||||
- [ ] Upgrade from last version tested.
|
||||
- [ ] Can be reviewed and tested.
|
||||
|
||||
## Package_check results
|
||||
---
|
||||
* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
|
||||
|
|
@ -68,7 +68,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
|
|||
#=================================================
|
||||
ynh_script_progression --message="Installing dependencies..." --weight=1
|
||||
|
||||
# Guacamole depends on Apache Tomcat.
|
||||
# Guacamole depends on Apache Tomcat.
|
||||
# But installing Tomcat from the Debian repos automatically enables and starts it.
|
||||
# So we stop and disable it, unless Tomcat was already enabled or started by the user beforehand
|
||||
|
||||
|
|
@ -136,13 +136,13 @@ mv "$final_path/etc/guacamole/lib/mariadb-java-client-2.7.2.jar" "$final_path/et
|
|||
|
||||
ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$final_path/"
|
||||
pushd "$final_path" || ynh_die
|
||||
ar x "$final_path/tomcat9_9.0.31-1~deb10u3_all.deb" "data.tar.xz"
|
||||
ar x "$final_path/tomcat9.deb" "data.tar.xz"
|
||||
popd || ynh_die
|
||||
ynh_secure_remove --file="$final_path/tomcat9_9.0.31-1~deb10u3_all.deb"
|
||||
ynh_secure_remove --file="$final_path/tomcat9.deb"
|
||||
mkdir -p "$final_path/tomcat9-data"
|
||||
tar -C "$final_path/tomcat9-data" -xJf "$final_path/data.tar.xz"
|
||||
cp -r "$final_path/tomcat9-data/usr/share/tomcat9/etc" -T "$final_path/etc/tomcat9/"
|
||||
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
|
||||
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
|
||||
ynh_secure_remove --file="$final_path/data.tar.xz"
|
||||
ynh_secure_remove --file="$final_path/tomcat9-data"
|
||||
|
||||
|
|
@ -184,8 +184,8 @@ ynh_script_progression --message="Compiling guacd..." --weight=30
|
|||
|
||||
pushd "$final_path/.guacd-src" || ynh_die
|
||||
./configure --enable-allow-freerdp-snapshots --prefix="$final_path" --datadir="$final_path" --with-freerdp-plugin-dir="$final_path/lib/x86_64-linux-gnu/freerdp2"
|
||||
make
|
||||
make install
|
||||
ynh_exec_warn_less make
|
||||
ynh_exec_warn_less make install
|
||||
popd || ynh_die
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -92,13 +92,13 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]; then
|
|||
|
||||
ynh_setup_source --source_id="tomcat9_deb" --dest_dir="$final_path/"
|
||||
pushd "$final_path" || ynh_die
|
||||
ar x "$final_path/tomcat9_9.0.31-1~deb10u3_all.deb" "data.tar.xz"
|
||||
ar x "$final_path/tomcat9.deb" "data.tar.xz"
|
||||
popd || ynh_die
|
||||
ynh_secure_remove --file="$final_path/tomcat9_9.0.31-1~deb10u3_all.deb"
|
||||
ynh_secure_remove --file="$final_path/tomcat9.deb"
|
||||
mkdir -p "$final_path/tomcat9-data"
|
||||
tar -C "$final_path/tomcat9-data" -xJf "$final_path/data.tar.xz"
|
||||
cp -r "$final_path/tomcat9-data/usr/share/tomcat9/etc" -T "$final_path/etc/tomcat9/"
|
||||
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
|
||||
cp -r "$final_path/tomcat9-data/etc/tomcat9/" -T "$final_path/etc/tomcat9/"
|
||||
ynh_secure_remove --file="$final_path/data.tar.xz"
|
||||
ynh_secure_remove --file="$final_path/tomcat9-data"
|
||||
fi
|
||||
|
|
@ -116,7 +116,7 @@ ynh_add_nginx_config
|
|||
#=================================================
|
||||
ynh_script_progression --message="Upgrading dependencies..." --weight=1
|
||||
|
||||
# Guacamole depends on Apache Tomcat.
|
||||
# Guacamole depends on Apache Tomcat.
|
||||
# But installing Tomcat from the Debian repos automatically enables and starts it.
|
||||
# So we stop and disable it, unless Tomcat was already enabled or started by the user beforehand
|
||||
|
||||
|
|
@ -158,8 +158,8 @@ ynh_script_progression --message="Compiling guacd..." --weight=30
|
|||
|
||||
pushd "$final_path/.guacd-src" || ynh_die
|
||||
./configure --enable-allow-freerdp-snapshots --prefix="$final_path" --datadir="$final_path" --with-freerdp-plugin-dir="$final_path/lib/x86_64-linux-gnu/freerdp2"
|
||||
make
|
||||
make install
|
||||
ynh_exec_warn_less make
|
||||
ynh_exec_warn_less make install
|
||||
popd || ynh_die
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue