avoid defaults carrying over

This commit is contained in:
James Barnett 2016-05-08 21:04:44 -05:00
parent 268256123e
commit ea654087df

View file

@ -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."