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

add option to abort pacman transaction on script fail

Browse source
This commit is contained in:
James Barnett 2016-08-31 20:55:42 -05:00
parent 5ef0091d9b
commit 9237b519f7
2 changed files with 49 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hooks/00_snapper-pre.hook
View file

@ -22,6 +22,7 @@ Operation = Install
Operation = Remove Operation = Remove
Type = Package Type = Package
Target = * Target = *
AbortOnFail
[Action] [Action]
Description = Performing snapper pre snapshots... Description = Performing snapper pre snapshots...

64
scripts/snap-pac
View file

@ -27,37 +27,59 @@ SNAPPER_CONFIG_FILE=/etc/conf.d/snapper
ERRORMSG="\033[00;31mERROR:\033[00m" ERRORMSG="\033[00;31mERROR:\033[00m"
WARNINGMSG="\033[00;33mWARNING:\033[00m" WARNINGMSG="\033[00;33mWARNING:\033[00m"
if [[ $EUID -ne 0 ]]; then PACMAN_ABORT_ON_FAIL="no"
echo -e "$ERRORMSG Script must be run as root."
exit 1
fi
if [[ ! -d /var/run/dbus ]]; then
echo -e "$ERRORMSG Unable to use snapper without dbus. Are you in a chroot environment?"
exit 1
fi
if [[ $# -ne 1 ]]; then
echo -e "$ERRORMSG Only one argument should be passed to this script."
exit 1
fi
if [[ $1 != "pre" ]] && [[ $1 != "post" ]]; then
echo -e "$ERRORMSG First argument should either be 'pre' or 'post'."
exit 1
fi
if [[ -f "$SNAPPER_CONFIG_FILE" ]]; then if [[ -f "$SNAPPER_CONFIG_FILE" ]]; then
source "$SNAPPER_CONFIG_FILE" source "$SNAPPER_CONFIG_FILE"
else else
echo -e "$ERRORMSG $SNAPPER_CONFIG_FILE does not exist!" echo -e "$ERRORMSG $SNAPPER_CONFIG_FILE does not exist!"
exit 0
fi
if [[ $EUID -ne 0 ]]; then
echo -e "$ERRORMSG Script must be run as root."
if [[ $PACMAN_ABORT_ON_FAIL == "no" ]]; then
exit 0
else
exit 1 exit 1
fi fi
fi
if [[ ! -d /var/run/dbus ]]; then
echo -e "$ERRORMSG Unable to use snapper without dbus. Are you in a chroot environment?"
if [[ $PACMAN_ABORT_ON_FAIL == "no" ]]; then
exit 0
else
exit 1
fi
fi
if [[ $# -ne 1 ]]; then
echo -e "$ERRORMSG Only one argument should be passed to this script."
if [[ $PACMAN_ABORT_ON_FAIL == "no" ]]; then
exit 0
else
exit 1
fi
fi
if [[ $1 != "pre" ]] && [[ $1 != "post" ]]; then
echo -e "$ERRORMSG First argument should either be 'pre' or 'post'."
if [[ $PACMAN_ABORT_ON_FAIL == "no" ]]; then
exit 0
else
exit 1
fi
fi
if [[ -z "$SNAPPER_CONFIGS" ]]; then if [[ -z "$SNAPPER_CONFIGS" ]]; then
echo -e "$WARNINGMSG No snapper configurations found, so not taking any snapshots!" echo -e "$WARNINGMSG No snapper configurations found, so not taking any snapshots!"
if [[ $PACMAN_ABORT_ON_FAIL == "no" ]]; then
exit 0
else
exit 1 exit 1
fi fi
fi
declare -r pre_or_post=$1 declare -r pre_or_post=$1
declare pacman_cmd declare pacman_cmd
@ -110,7 +132,11 @@ done
if [[ $x -eq 0 ]]; then if [[ $x -eq 0 ]]; then
echo -e "$WARNINGMSG No snapper configurations are set up for snapshots to be taken!" echo -e "$WARNINGMSG No snapper configurations are set up for snapshots to be taken!"
if [[ $PACMAN_ABORT_ON_FAIL == "no" ]]; then
exit 0
else
exit 1 exit 1
fi fi
fi
exit 0 exit 0