From ea654087dfc1f2cbe9b3e44edcbf71743d834dd0 Mon Sep 17 00:00:00 2001 From: James Barnett Date: Sun, 8 May 2016 21:04:44 -0500 Subject: [PATCH] avoid defaults carrying over --- snap-pac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/snap-pac b/snap-pac index 232ab65..3300051 100755 --- a/snap-pac +++ b/snap-pac @@ -53,18 +53,20 @@ for CONFIG in $SNAPPER_CONFIGS; do if [[ $CONFIG == "root" ]]; then PACMAN_PRE_POST="yes" fi - + PACMAN_PRE_DESCRIPTION="$pacman_cmd" + PACMAN_POST_DESCRIPTION="$pacman_cmd" + PACMAN_CLEANUP_ALGORITHM="number" source /etc/snapper/configs/$CONFIG [[ $PACMAN_PRE_POST != "yes" ]] && continue prefile="/tmp/snap-pac-pre_$CONFIG" - snapper_cmd="snapper --config $CONFIG create --type $pre_or_post --cleanup-algorithm ${PACMAN_CLEANUP_ALGORITHM:-"number"}" + snapper_cmd="snapper --config $CONFIG create --type $pre_or_post --cleanup-algorithm $PACMAN_CLEANUP_ALGORITHM" if [[ "$pre_or_post" == "pre" ]]; then - $snapper_cmd --description "${PACMAN_PRE_DESCRIPTION:-$pacman_cmd}" --print-number > $prefile + $snapper_cmd --description "$PACMAN_PRE_DESCRIPTION" --print-number > $prefile elif [[ -f $prefile ]]; then - $snapper_cmd --description "${PACMAN_POST_DESCRIPTION:-$pacman_cmd}" --pre-number $(< $prefile) + $snapper_cmd --description "$PACMAN_POST_DESCRIPTION" --pre-number $(< $prefile) rm $prefile else echo "WARNING: $prefile does not exist, so no post snapshot will be taken. If you are initially installing snap-pac, this is normal."