From 140608b2e6dedc27db661b01361f433530dc667f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 Nov 2021 15:02:27 +0100 Subject: [PATCH] Remove ynh_print_OFF/ON --- manifest.json | 2 +- scripts/install | 6 ++---- scripts/restore | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 485cafa..bfc8daa 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Automatic backups", "fr": "Sauvegardes automatiques" }, - "version": "1.3.1~ynh1", + "version": "1.3.1~ynh2", "url": "https://github.com/maniackcrudelis/archivist", "license": "GPL-3.0", "maintainer": { diff --git a/scripts/install b/scripts/install index a877651..321a061 100755 --- a/scripts/install +++ b/scripts/install @@ -22,7 +22,7 @@ ynh_abort_if_errors #================================================= encrypt=$YNH_APP_ARG_ENCRYPT -ynh_print_OFF; encryption_pwd=$YNH_APP_ARG_ENCRYPTION_PWD; ynh_print_ON +encryption_pwd=$YNH_APP_ARG_ENCRYPTION_PWD core_backup=$YNH_APP_ARG_CORE_BACKUP apps_backup=$YNH_APP_ARG_APPS_BACKUP frequency="$YNH_APP_ARG_FREQUENCY" @@ -38,9 +38,7 @@ final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" if [ $encrypt -eq 1 ]; then - ynh_print_OFF test -n "$encryption_pwd" || ynh_die --message="encryption_pwd can't be empty if you choose to enable encryption." - ynh_print_ON fi #================================================= @@ -104,7 +102,7 @@ then encrypt=true passkey="$final_path/passkey" - ynh_print_OFF; echo "$encryption_pwd" > "$passkey"; ynh_print_ON + echo "$encryption_pwd" > "$passkey" chmod 400 "$passkey" else encrypt=false diff --git a/scripts/restore b/scripts/restore index db4fd2b..91c1851 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,8 +31,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." -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