me/snap-pac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

no need to list configurations that aren't being snapshotted

Browse source
This commit is contained in:
James Barnett 2017-02-03 11:45:13 -06:00
parent e6ec6a7c8f
commit 8f10395a88
No known key found for this signature in database
GPG key ID: E4B5E45AA3B8C5C3
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hooks/00_snapper-pre.hook
View file

@ -24,7 +24,7 @@ Type = Package
Target = *
[Action]
Description = Performing snapper pre snapshots...
Description = Performing snapper pre snapshots for the following configurations...
Depends = snap-pac
When = PreTransaction
Exec = /usr/share/libalpm/scripts/snap-pac pre

2
hooks/zz_snapper-post.hook
View file

@ -24,7 +24,7 @@ Type = Package
Target = *
[Action]
Description = Performing snapper post snapshots...
Description = Performing snapper post snapshots for the following configurations...
Depends = snap-pac
When = PostTransaction
Exec = /usr/share/libalpm/scripts/snap-pac post

10
scripts/snap-pac
View file

@ -128,8 +128,6 @@ for CONFIG in $SNAPPER_CONFIGS; do
# Source snapper configuration to override defaults
source /etc/snapper/configs/"$CONFIG"
printf " %s " "$CONFIG"
if [[ $PACMAN_PRE_POST == "yes" ]]; then
prefile="/tmp/snap-pac-pre_$CONFIG"
@ -138,18 +136,19 @@ for CONFIG in $SNAPPER_CONFIGS; do
x=$((x+1))
if [[ "$pre_or_post" == "pre" ]]; then
printf " %s " "$CONFIG"
if [[ "${#PACMAN_PRE_DESCRIPTION}" -gt $DESC_LIMIT ]]; then
PACMAN_PRE_DESCRIPTION="$(echo $PACMAN_PRE_DESCRIPTION | cut -c 1-$DESC_LIMIT)..."
fi
$snapper_cmd --description "$PACMAN_PRE_DESCRIPTION" --print-number > "$prefile"
printf "%s %s\n" "$(< "$prefile")" "$checkmark"
elif [[ "$pre_or_post" == "rem" ]]; then
printf "N/A\n"
if [[ -f $prefile ]]; then
rm "$prefile"
fi
elif [[ "$pre_or_post" == "post" ]]; then
if [[ -f $prefile ]]; then
printf " %s " "$CONFIG"
if [[ "${#PACMAN_POST_DESCRIPTION}" -gt $DESC_LIMIT ]]; then
PACMAN_POST_DESCRIPTION="$(echo $PACMAN_POST_DESCRIPTION | cut -c 1-$DESC_LIMIT)..."
fi
@ -157,15 +156,10 @@ for CONFIG in $SNAPPER_CONFIGS; do
printf "%s %s\n" "$postnum" "$checkmark"
rm "$prefile"
else
printf "N/A\n"
printf "%b %s does not exist, so no post snapshot for %s will be taken. If you are initially installing snap-pac, this is normal.\n" "$WARNINGMSG" "$prefile" "$CONFIG"
fi
fi
else
printf "N/A\n"
fi
done