From ac62592e26c7fe0aa939cbc2e9e2d321c38b6db9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Feb 2022 09:39:04 +0100 Subject: [PATCH] Fix --- conf/app.src | 2 +- scripts/install | 2 +- scripts/restore | 10 +--------- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4ca86b2..768a4e4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,5 +3,5 @@ SOURCE_SUM=c99504c6de678fd91aed357ff0dada16a8df9e932970ed85767b516a9f87df52 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=kiwiirc_20.05.24.1-1_amd64.deb +SOURCE_FILENAME=kiwiirc.deb SOURCE_EXTRACT=false diff --git a/scripts/install b/scripts/install index 542e07d..39adbcf 100644 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ ynh_script_progression --message="Setting up source files..." --weight=2 tempdir="$(mktemp -d)" ynh_setup_source --dest_dir=$tempdir --source_id=app -ynh_exec_warn_less dpkg -i $tempdir/kiwiirc_20.05.24.1-1_amd64.deb +ynh_exec_warn_less dpkg -i $tempdir/kiwiirc.deb #================================================= # ADD A CONFIGURATION diff --git a/scripts/restore b/scripts/restore index b7df713..2cf32f2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,7 +40,7 @@ ynh_script_progression --message="Setting up source files..." --weight=2 tempdir="$(mktemp -d)" ynh_setup_source --dest_dir=$tempdir --source_id=app -ynh_exec_warn_less dpkg -i $tempdir/kiwiirc_20.05.24.1-1_amd64.deb +ynh_exec_warn_less dpkg -i $tempdir/kiwiirc.deb #================================================= # RESTORE THE NGINX CONFIGURATION @@ -49,14 +49,6 @@ ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/kiwiirc" -#================================================= -# RESTORE SYSTEMD -#================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service --quiet - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5eac6af..da0df06 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,7 +48,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then tempdir="$(mktemp -d)" ynh_setup_source --dest_dir=$tempdir --source_id=app - ynh_exec_warn_less dpkg -i $tempdir/kiwiirc_20.05.24.1-1_amd64.deb + ynh_exec_warn_less dpkg -i $tempdir/kiwiirc.deb fi #=================================================