From a0fdf1bfce9e67592f8c27d74dc7885341d3e5c8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Mar 2022 15:34:31 +0100 Subject: [PATCH] cleaning --- scripts/install | 3 +-- scripts/upgrade | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 14a969f..2e54628 100644 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -architecture=$YNH_ARCH key=$(ynh_string_random) app=$YNH_APP_INSTANCE_NAME @@ -87,7 +86,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir=$final_path --source_id="$architecture" +ynh_setup_source --dest_dir=$final_path --source_id=$YNH_ARCH chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 2df888a..2d827fd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,7 +26,6 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) admin=$(ynh_app_setting_get --app=$app --key=admin) port=$(ynh_app_setting_get --app=$app --key=port) -architecture=$YNH_ARCH datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= @@ -84,7 +83,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir=$final_path --source_id="$architecture" --keep="$final_path/custom/conf/app.ini $final_path/custom/conf/auth.d/ldap.conf" +ynh_setup_source --dest_dir=$final_path --source_id=$YNH_ARCH --keep="$final_path/custom/conf/app.ini $final_path/custom/conf/auth.d/ldap.conf" chmod 750 "$final_path" chmod -R o-rwx "$final_path"