From ddb226ff0097d3f3748d9943d197201c2efd3c72 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 17 Dec 2021 07:54:55 +0100 Subject: [PATCH] Arcch helper --- conf/{arm6.src => armhf.src} | 0 scripts/restore | 3 +-- scripts/upgrade | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename conf/{arm6.src => armhf.src} (100%) diff --git a/conf/arm6.src b/conf/armhf.src similarity index 100% rename from conf/arm6.src rename to conf/armhf.src diff --git a/scripts/restore b/scripts/restore index 9eb4d26..9ab786d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index 076acea..f154722 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) +architecture=$YNH_ARCH #================================================= # CHECK VERSION @@ -68,7 +69,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" fi chmod 750 "$final_path" @@ -124,7 +125,7 @@ ynh_permission_update --permission="main" --remove=all_users --add=$admin #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -132,4 +133,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression --message="Upgrade of $app completed" --last