From 5200b2b9fc7f3023e2c3fd68563916c61fc5b4a7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 8 Feb 2022 00:24:18 +0100 Subject: [PATCH] Fix bullseye --- conf/app.src | 1 + scripts/install | 9 +++++++++ scripts/restore | 27 +++++++++++++++++++-------- scripts/upgrade | 9 +++++++++ 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/conf/app.src b/conf/app.src index 6902035..c2123ad 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME=yunomonitor-1-1-0.tar.gz +SOURCE_EXTRACT=true diff --git a/scripts/install b/scripts/install index c7eb68f..92ca707 100755 --- a/scripts/install +++ b/scripts/install @@ -90,6 +90,15 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= # SPECIFIC SETUP +#================================================= +# BUILD YUNOMONITOR +#================================================= +ynh_script_progression --message="Building Yunomonitor..." + +pushd "$final_path" + pip3 install pycryptodome +popd + #================================================= # SETUP SYSTEMD #================================================= diff --git a/scripts/restore b/scripts/restore index 06f69d5..f7346c4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,14 +37,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -72,6 +64,25 @@ chmod u+x $final_path/yunomonitor.py chmod u+w $final_path/conf chmod u+w $final_path/well-known +#================================================= +# SPECIFIC RESTORATION +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + +#================================================= +# BUILD YUNOMONITOR +#================================================= +ynh_script_progression --message="Building Yunomonitor..." + +pushd "$final_path" + pip3 install pycryptodome +popd + #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2b9d5e6..718b08f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,6 +101,15 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC UPGRADE +#================================================= +# BUILD YUNOMONITOR +#================================================= +ynh_script_progression --message="Building Yunomonitor..." + +pushd "$final_path" + pip3 install pycryptodome +popd + #================================================= # STORE THE CONFIG FILE CHECKSUM #=================================================