From 421994a3efe93d93eb20b2dcad0185aeb6449ded Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 22 Dec 2017 19:01:09 +0100 Subject: [PATCH 1/4] [enh] Tranfert backup_core_only to BACKUP_CORE_ONLY --- data/helpers.d/utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/helpers.d/utils b/data/helpers.d/utils index 2cb18c5c0..4679121e4 100644 --- a/data/helpers.d/utils +++ b/data/helpers.d/utils @@ -77,7 +77,7 @@ ynh_backup_before_upgrade () { fi # Create backup - sudo yunohost backup create --ignore-system --apps $app --name $app_bck-pre-upgrade$backup_number + sudo BACKUP_CORE_ONLY=1 yunohost backup create --ignore-system --apps $app --name $app_bck-pre-upgrade$backup_number if [ "$?" -eq 0 ] then # If the backup succeeded, remove the previous backup From 810eaec8c995495f2b86ef17d73b7f12ffbb342f Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Fri, 22 Dec 2017 19:27:02 +0100 Subject: [PATCH 2/4] Don't backup big data items when BACKUP_CORE_ONLY is set --- data/helpers.d/filesystem | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/helpers.d/filesystem b/data/helpers.d/filesystem index 6fb073e06..6f24a7777 100644 --- a/data/helpers.d/filesystem +++ b/data/helpers.d/filesystem @@ -47,6 +47,12 @@ ynh_backup() { local DEST_PATH="${2:-}" local IS_BIG="${3:-0}" + # If backing up core only (used by ynh_backup_before_upgrade), + # don't backup big data items + if [ "$IS_BIG" == "1" ] && [ -n "$BACKUP_CORE_ONLY" ] ; then + return 0 + fi + # ============================================================================== # Format correctly source and destination paths # ============================================================================== From 3dd6317ae6d93997c9f4d512c4ded0c626108b08 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 22 Dec 2017 19:33:47 +0100 Subject: [PATCH 3/4] Add info --- data/helpers.d/filesystem | 1 + 1 file changed, 1 insertion(+) diff --git a/data/helpers.d/filesystem b/data/helpers.d/filesystem index 6f24a7777..f8da72ad5 100644 --- a/data/helpers.d/filesystem +++ b/data/helpers.d/filesystem @@ -50,6 +50,7 @@ ynh_backup() { # If backing up core only (used by ynh_backup_before_upgrade), # don't backup big data items if [ "$IS_BIG" == "1" ] && [ -n "$BACKUP_CORE_ONLY" ] ; then + echo "$SRC_PATH will not be saved, because backup_core_only is set." >&2 return 0 fi From 52898891742dfb868581a8af1d322e129ab6751f Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 10 Jan 2018 00:44:25 +0100 Subject: [PATCH 4/4] Be nice with set -eu --- data/helpers.d/filesystem | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/helpers.d/filesystem b/data/helpers.d/filesystem index f8da72ad5..8f6665891 100644 --- a/data/helpers.d/filesystem +++ b/data/helpers.d/filesystem @@ -46,10 +46,11 @@ ynh_backup() { local SRC_PATH="$1" local DEST_PATH="${2:-}" local IS_BIG="${3:-0}" + BACKUP_CORE_ONLY=${BACKUP_CORE_ONLY:-0} # If backing up core only (used by ynh_backup_before_upgrade), # don't backup big data items - if [ "$IS_BIG" == "1" ] && [ -n "$BACKUP_CORE_ONLY" ] ; then + if [ "$IS_BIG" == "1" ] && [ "$BACKUP_CORE_ONLY" == "1" ] ; then echo "$SRC_PATH will not be saved, because backup_core_only is set." >&2 return 0 fi