From 923d232f8e283dc69cd86aa6852690e6468f94d9 Mon Sep 17 00:00:00 2001 From: James Barnett Date: Tue, 14 Feb 2017 13:22:00 -0600 Subject: [PATCH] create set_defaults --- scripts/snap-pac | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/snap-pac b/scripts/snap-pac index a2f72d8..e81817e 100755 --- a/scripts/snap-pac +++ b/scripts/snap-pac @@ -45,6 +45,14 @@ truncate_description() { fi } +set_defaults() { + PACMAN_PRE_POST="no" + [[ $CONFIG == "root" ]] && PACMAN_PRE_POST="yes" + PACMAN_PRE_DESCRIPTION="$pacman_cmd" + PACMAN_POST_DESCRIPTION="$pacman_cmd" + PACMAN_CLEANUP_ALGORITHM="number" +} + trap error_exit ERR trap kill_exit SIGTERM SIGINT @@ -66,14 +74,7 @@ fi declare -i x=0 for CONFIG in $SNAPPER_CONFIGS; do - # Set defaults - PACMAN_PRE_POST="no" - [[ $CONFIG == "root" ]] && PACMAN_PRE_POST="yes" - PACMAN_PRE_DESCRIPTION="$pacman_cmd" - PACMAN_POST_DESCRIPTION="$pacman_cmd" - PACMAN_CLEANUP_ALGORITHM="number" - - # Source snapper configuration to override defaults + set_defaults source /etc/snapper/configs/"$CONFIG" [[ $PACMAN_PRE_POST == "no" ]] && continue