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

Remove redundant checks

Browse source 
Just check to see if pacman is running
This commit is contained in:
James Barnett 2017-02-14 13:34:05 -06:00
parent 6efd9d6fc7
commit 1eebf453e0
No known key found for this signature in database
GPG key ID: E4B5E45AA3B8C5C3
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/snap-pac
View file

@ -24,6 +24,9 @@ declare -r SNAPPER_CONFIG_FILE=/etc/conf.d/snapper
declare -r DESC_LIMIT=48 declare -r DESC_LIMIT=48
declare -r name="snap-pac" declare -r name="snap-pac"
declare PACMAN_ABORT_ON_FAIL="no" declare PACMAN_ABORT_ON_FAIL="no"
declare -r pacman_cmd="$(sed 's./usr/bin/pacman.pacman.g' <(ps -C pacman -o args=))"
declare -i x=0
declare -r pre_or_post=$1
out() { printf "$1 $2\n" "${@:3}"; } out() { printf "$1 $2\n" "${@:3}"; }
error() { out "==> \033[00;31mERROR:\033[00m" "$@"; } >&2 error() { out "==> \033[00;31mERROR:\033[00m" "$@"; } >&2
@ -56,21 +59,11 @@ set_defaults() {
trap error_exit ERR trap error_exit ERR
trap kill_exit SIGTERM SIGINT trap kill_exit SIGTERM SIGINT
[[ -z "$pacman_cmd" ]] && die "snap-pac should only be called via provided pacman hooks."
[[ ! -d /var/run/dbus ]] && die "No dbus available. Are you in a chroot environment?"
source "$SNAPPER_CONFIG_FILE" source "$SNAPPER_CONFIG_FILE"
[[ ! -d /var/run/dbus ]] && die "No dbus available. Are you in a chroot environment?"
[[ $# -ne 1 ]] && die "Only one argument should be passed to this script."
[[ $1 != "pre" ]] && [[ $1 != "post" ]] && die "First argument should either be 'pre' or 'post'."
declare -r pre_or_post=$1
declare pacman_cmd="$(sed 's./usr/bin/pacman.pacman.g' <(ps -C pacman -o args=))"
if [[ -z "$pacman_cmd" ]]; then
warning "Did not find pacman running."
pacman_cmd="pacman"
fi
declare -i x=0
for CONFIG in $SNAPPER_CONFIGS; do for CONFIG in $SNAPPER_CONFIGS; do
set_defaults set_defaults