1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/tiki_ynh.git synced 2024-09-04 01:15:54 +02:00

Fix regular vs. LTS source usage logic, and switch to new sources format

This commit is contained in:
Alexandre Aubin 2023-05-12 20:38:15 +02:00
parent 044f236aa8
commit addae4124e
4 changed files with 31 additions and 26 deletions

View file

@ -1,18 +0,0 @@
if [ "$release_cycle" == "regular" ];
then
SOURCE_URL=https://sourceforge.net/projects/tikiwiki/files/Tiki_25.x_Sagittarius_A/25.0/tiki-25.0.tar.gz/download
SOURCE_SUM=e056cdcfdcb03a8c4710db44e7f04e0f846eb7131a8f8aa130a3d8348e0161a4
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=
SOURCE_EXTRACT=true
else
SOURCE_URL=https://sourceforge.net/projects/tikiwiki/files/Tiki_25.x_Sagittarius_A/25.0/tiki-25.0.tar.gz/download
SOURCE_SUM=e056cdcfdcb03a8c4710db44e7f04e0f846eb7131a8f8aa130a3d8348e0161a4
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=
SOURCE_EXTRACT=true
fi

View file

@ -34,13 +34,13 @@ ram.runtime = "50M"
default = "/tiki" default = "/tiki"
[install.release_cycle] [install.release_cycle]
ask.en = "Upgrade cycle" ask.en = "Upgrade cycle"
ask.fr = "Cycle de mises à jours" ask.fr = "Cycle de mises à jours"
help.en = "Every 3 version is an LTS. LTS versions are supported for 4 years" help.en = "Every 3 version is an LTS. LTS versions are supported for 4 years"
help.fr = "Toutes les 3 versions sont des LTS qui sont maintenues pendant 4 ans" help.fr = "Toutes les 3 versions sont des LTS qui sont maintenues pendant 4 ans"
type = "select" type = "select"
choices.longterm = "Install latest Long Term Support version" choices.longterm = "Install latest Long Term Support version (recommended)"
choices.regular = "Install latest version" choices.regular = "Install latest version"
default = "longterm" default = "longterm"
[install.init_main_permission] [install.init_main_permission]
@ -48,6 +48,17 @@ ram.runtime = "50M"
default = "visitors" default = "visitors"
[resources] [resources]
[resources.sources]
[resources.sources.main]
url = "https://sourceforge.net/projects/tikiwiki/files/Tiki_25.x_Sagittarius_A/25.0/tiki-25.0.tar.gz/download"
sha256 = "e056cdcfdcb03a8c4710db44e7f04e0f846eb7131a8f8aa130a3d8348e0161a4"
[resources.sources.lts]
url = "https://sourceforge.net/projects/tikiwiki/files/Tiki_25.x_Sagittarius_A/25.0/tiki-25.0.tar.gz/download"
sha256 = "e056cdcfdcb03a8c4710db44e7f04e0f846eb7131a8f8aa130a3d8348e0161a4"
[resources.system_user] [resources.system_user]
[resources.install_dir] [resources.install_dir]

View file

@ -27,7 +27,13 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
ynh_script_progression --message="Setting up source files..." --weight=15 ynh_script_progression --message="Setting up source files..." --weight=15
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" source_id_to_use="main"
if [[ "$release_cycle" != "longterm" ]]
then
source_id_to_use="lts"
fi
ynh_setup_source --dest_dir="$install_dir" --source_id="$source_id_to_use"
chmod -R o-rwx "$install_dir" chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir" chown -R $app:www-data "$install_dir"

View file

@ -47,7 +47,13 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" source_id_to_use="main"
if [[ "$release_cycle" != "longterm" ]]
then
source_id_to_use="lts"
fi
ynh_setup_source --dest_dir="$install_dir" --source_id="$source_id_to_use"
fi fi
chmod -R o-rwx "$install_dir" chmod -R o-rwx "$install_dir"