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

some cleanup

Browse source
This commit is contained in:
James Barnett 2018-01-18 19:06:37 -05:00
parent 8e1cde3f01
commit 5db7eb1468
No known key found for this signature in database
GPG key ID: E4B5E45AA3B8C5C3
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
scripts/snap-pac
View file

@ -20,11 +20,20 @@
set -o errtrace set -o errtrace
declare -r name="snap-pac" readonly argv0="snap-pac"
declare -r SNAPPAC_CONFIG_FILE=/etc/snap-pac.conf readonly SNAPPAC_CONFIG_FILE=/etc/snap-pac.conf
declare -r SNAPPER_CONFIG_FILE=/etc/conf.d/snapper readonly SNAPPER_CONFIG_FILE=/etc/conf.d/snapper
declare -r pacman_cmd="$(ps -q $(ps -p "$$" -o ppid=) -o args=)" readonly pacman_cmd="$(ps -q $(ps -p "$$" -o ppid=) -o args=)"
declare -r pre_or_post=$1 readonly pre_or_post=$1
out() { printf "$1 $2\n" "${@:3}"; }
error() { out "==> \033[00;31merror:\033[00m" "$@"; } >&2
die() {
[[ $ABORT_ON_FAIL == "no" ]] && exit 0
exit 1
}
read_config() { read_config() {
CONFIG_FILE="$1" CONFIG_FILE="$1"
@ -42,27 +51,17 @@ read_config() {
} }
read_config "$SNAPPAC_CONFIG_FILE"
declare -r DESC_LIMIT=${DESC_LIMIT:-48}
declare -r ABORT_ON_FAIL=${ABORT_ON_FAIL:-"no"}
out() { printf "$1 $2\n" "${@:3}"; }
error() { out "==> \033[00;31merror:\033[00m" "$@"; } >&2
die() {
[[ $ABORT_ON_FAIL == "no" ]] && exit 0
exit 1
}
trapkill() { trapkill() {
error "Exited due to user intervention." error "Exited due to user intervention."
die die
} }
traperror() { traperror() {
error "Exited due to error on line $1" error "Exited due to error on line $1"
out "exit status:" "$2" out "exit status:" "$2"
out "command:" "$3" out "command:" "$3"
out "bash line:" "$4" out "bash line:" "$4"
out "function name:" "$5" out "function argv0:" "$5"
die die
} }
@ -78,8 +77,15 @@ truncate_description() {
trap 'traperror ${LINENO} $? "$BASH_COMMAND" $BASH_LINENO "${FUNCNAME[@]}"' ERR trap 'traperror ${LINENO} $? "$BASH_COMMAND" $BASH_LINENO "${FUNCNAME[@]}"' ERR
trap trapkill SIGTERM SIGINT trap trapkill SIGTERM SIGINT
readonly -f read_config out error die trapkill traperror truncate_description
SNAPPER_CONFIGS=$(awk -F'=' '/SNAPPER_CONFIGS/ {gsub(/"/, "", $2); print $2}' "$SNAPPER_CONFIG_FILE") SNAPPER_CONFIGS=$(awk -F'=' '/SNAPPER_CONFIGS/ {gsub(/"/, "", $2); print $2}' "$SNAPPER_CONFIG_FILE")
read_config "$SNAPPAC_CONFIG_FILE"
readonly DESC_LIMIT=${DESC_LIMIT:-48}
readonly ABORT_ON_FAIL=${ABORT_ON_FAIL:-"no"}
for CONFIG in $SNAPPER_CONFIGS; do for CONFIG in $SNAPPER_CONFIGS; do
unset SNAPSHOT unset SNAPSHOT
@ -100,7 +106,7 @@ for CONFIG in $SNAPPER_CONFIGS; do
[[ $SNAPSHOT == "no" ]] && continue [[ $SNAPSHOT == "no" ]] && continue
prefile="/tmp/$name-pre_$CONFIG" prefile="/tmp/$argv0-pre_$CONFIG"
snapper_cmd="snapper --config $CONFIG create --type $pre_or_post --cleanup-algorithm $CLEANUP_ALGORITHM --print-number --description" snapper_cmd="snapper --config $CONFIG create --type $pre_or_post --cleanup-algorithm $CLEANUP_ALGORITHM --print-number --description"
if [[ "$pre_or_post" == "pre" ]]; then if [[ "$pre_or_post" == "pre" ]]; then