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

add removal to main script

Browse source
This commit is contained in:
James Barnett 2017-02-03 08:42:43 -06:00
parent 439f925abf
commit 7d981ff6fd
No known key found for this signature in database
GPG key ID: E4B5E45AA3B8C5C3
3 changed files with 6 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hooks/10_snap-pac-removal.hook
View file

@ -25,4 +25,4 @@ Target = snap-pac
Description = NOTE: You are removing snap-pac. No post transaction snapshots will be taken. Description = NOTE: You are removing snap-pac. No post transaction snapshots will be taken.
Depends = snap-pac Depends = snap-pac
When = PreTransaction When = PreTransaction
Exec = /usr/share/libalpm/scripts/snap-pac-remove Exec = /usr/share/libalpm/scripts/snap-pac rem

7
scripts/snap-pac
View file

@ -85,8 +85,8 @@ if [[ $# -ne 1 ]]; then
fi fi
fi fi
if [[ $1 != "pre" ]] && [[ $1 != "post" ]]; then if [[ $1 != "pre" ]] && [[ $1 != "post" ]] && [[ $1 != "rem" ]]; then
printf "%b First argument should either be 'pre' or 'post'.\n" "$ERRORMSG" printf "%b First argument should either be 'pre', 'post', or 'rem'.\n" "$ERRORMSG"
if [[ $PACMAN_ABORT_ON_FAIL == "yes" ]]; then if [[ $PACMAN_ABORT_ON_FAIL == "yes" ]]; then
exit 1 exit 1
else else
@ -138,6 +138,9 @@ for CONFIG in $SNAPPER_CONFIGS; do
if [[ "$pre_or_post" == "pre" ]]; then if [[ "$pre_or_post" == "pre" ]]; then
$snapper_cmd --description "$PACMAN_PRE_DESCRIPTION" --print-number > "$prefile" $snapper_cmd --description "$PACMAN_PRE_DESCRIPTION" --print-number > "$prefile"
printf "%s %s\n" "$(< "$prefile")" "$checkmark" printf "%s %s\n" "$(< "$prefile")" "$checkmark"
elif [[ "$pre_or_post" == "rem" && -f "$prefile" ]]; then
printf "N/A\n"
rm "$prefile"
elif [[ -f $prefile ]]; then elif [[ -f $prefile ]]; then
postnum=$($snapper_cmd --description "$PACMAN_POST_DESCRIPTION" --print-number --pre-number "$(< "$prefile")") postnum=$($snapper_cmd --description "$PACMAN_POST_DESCRIPTION" --print-number --pre-number "$(< "$prefile")")
printf "%s %s\n" "$postnum" "$checkmark" printf "%s %s\n" "$postnum" "$checkmark"

49
scripts/snap-pac-remove
View file

@ -1,49 +0,0 @@
#!/bin/bash
# snap-pac
# https://github.com/wesbarnett/snap-pac
# Copyright (C) 2016 James W. Barnett
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Removes file that stores pre number when snap-pac is removed.
set -e
SNAPPER_CONFIG_FILE=/etc/conf.d/snapper
ERRORMSG="\033[00;31mERROR:\033[00m"
if [[ $EUID -ne 0 ]]; then
echo -e "$ERRORMSG Script must be run as root."
exit 1
fi
if [[ -f "$SNAPPER_CONFIG_FILE" ]]; then
source "$SNAPPER_CONFIG_FILE"
else
exit 1
fi
for CONFIG in $SNAPPER_CONFIGS; do
prefile="/tmp/snap-pac-pre_$CONFIG"
if [[ -f "$prefile" ]]; then
rm "$prefile"
fi
done
exit 0