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

rearrange how package update is detected

Browse source
This commit is contained in:
James Barnett 2017-04-20 08:36:06 -05:00
parent 76c4151814
commit 6ad1c1f571
No known key found for this signature in database
GPG key ID: E4B5E45AA3B8C5C3
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/snap-pac
View file

@ -18,19 +18,11 @@
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
kernel_updated="no"
while read -r f; do
if [[ "$f" == "linux" ]]; then
kernel_updated="yes"
fi
done
declare -r SNAPPER_CONFIG_FILE=/etc/conf.d/snapper 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="$(ps -q $(ps -p "$$" -o ppid=) -o args=)" declare -r pacman_cmd="$(ps -q $(ps -p "$$" -o ppid=) -o args=)"
declare -i x=0
declare -r pre_or_post=$1 declare -r pre_or_post=$1
out() { printf "$1 $2\n" "${@:3}"; } out() { printf "$1 $2\n" "${@:3}"; }
@ -61,9 +53,25 @@ set_defaults() {
PACMAN_LINK_MOCULES="no" PACMAN_LINK_MOCULES="no"
} }
package_updated() {
check="$1"
for x in ${packages[@]}; do
echo $x
if [[ "$x" == "$check" ]]; then
echo "yes"
return
fi
done
echo "no"
}
trap error_exit ERR trap error_exit ERR
trap kill_exit SIGTERM SIGINT trap kill_exit SIGTERM SIGINT
mapfile -t packages
kernel_updated=$(package_updated "linux")
source "$SNAPPER_CONFIG_FILE" source "$SNAPPER_CONFIG_FILE"
for CONFIG in $SNAPPER_CONFIGS; do for CONFIG in $SNAPPER_CONFIGS; do
@ -86,7 +94,7 @@ for CONFIG in $SNAPPER_CONFIGS; do
printf "==> %s: $(echo $x | tee "$prefile")\n" "$CONFIG" printf "==> %s: $(echo $x | tee "$prefile")\n" "$CONFIG"
elif [[ -f $prefile && "$pre_or_post" == "post" ]]; then elif [[ -f $prefile && "$pre_or_post" == "post" ]]; then
if [[ "$PACMAN_LINK_MODULES" == "yes" && "$kernel_updated" == "yes" ]]; then if [[ "$PACMAN_LINK_MODULES" == "yes" && "$kernel_updated" == "yes" ]]; then
printf "==> Linking old kernels and modules...\n" printf "==> Linking old kernel modules...\n"
ln -sv /.snapshots/$(<$prefile)/snapshot/usr/lib/modules/$(uname -r) /usr/lib/modules/ ln -sv /.snapshots/$(<$prefile)/snapshot/usr/lib/modules/$(uname -r) /usr/lib/modules/
fi fi
x=$($snapper_cmd "$(truncate_description $PACMAN_POST_DESCRIPTION)" --pre-number "$(< "$prefile")") x=$($snapper_cmd "$(truncate_description $PACMAN_POST_DESCRIPTION)" --pre-number "$(< "$prefile")")