From 4f25ac388fbc07d6cdd553059e70c458e5f38fb9 Mon Sep 17 00:00:00 2001
From: James Barnett <jbarnet4@tulane.edu>
Date: Mon, 25 Apr 2016 15:24:34 -0500
Subject: [PATCH] make main script that is sourced

---
 snap-pac     | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 snapper-post | 19 +------------------
 snapper-pre  | 14 +-------------
 3 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100755 snap-pac

diff --git a/snap-pac b/snap-pac
new file mode 100755
index 0000000..141e37f
--- /dev/null
+++ b/snap-pac
@@ -0,0 +1,52 @@
+#!/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.
+
+# Main script
+
+if [ -f /etc/snap-pac.conf ]; then
+    source /etc/snap-pac.conf
+else
+    echo "WARNING: /etc/snap-pac.conf is missing. Using default settings."
+fi
+
+declare -r cleanupalgo=${CLEANUP_ALGORITHM:-"number"}
+declare -r description=${POST_DESCRIPTION:-"$(echo $(ps -C pacman -o args=) | sed 'sX/usr/bin/pacmanXpacmanXg')"}
+declare -r configurations=${CONFIGS:-"root"}
+declare -r prefile_prefix="/usr/share/libalpm/hooks.bin/snap-pac/.pre"
+
+function pre
+{
+    for x in $configurations; do
+        snapper --config $x create --type pre --cleanup-algorithm $cleanupalgo --print-number --description "$description" > $prefile_prefix"_"$x
+    done
+}
+
+function post 
+{
+    for x in $configurations; do
+        if [ -f $prefile_prefix"_"$x ]; then
+            snapper --config $x create --cleanup-algorithm $cleanupalgo --type post --pre-number $(cat $prefile_prefix"_"$x) --description "$description"
+            rm $prefile_prefix"_"$x
+        else
+            echo "WARNING: $prefile_prefix"_"$x does not exist, so no post snapshot will be taken. If you are initially installing snap-pac, this is normal."
+        fi
+    done
+
+}
diff --git a/snapper-post b/snapper-post
index 95be55a..97b5a9b 100755
--- a/snapper-post
+++ b/snapper-post
@@ -20,21 +20,4 @@
 
 # Takes a snapper post snapshot after a pacman transaction
 
-if [ -f /etc/snap-pac.conf ]; then
-    source /etc/snap-pac.conf
-else
-    echo "WARNING: /etc/snap-pac.conf is missing. Using default settings."
-fi
-
-declare -r cleanupalgo=${CLEANUP_ALGORITHM:-"number"}
-declare -r description=${POST_DESCRIPTION:-"$(echo $(ps -C pacman -o args=) | sed 'sX/usr/bin/pacmanXpacmanXg')"}
-declare -r configurations=${CONFIGS:-"root"}
-declare -r prefile_prefix="/usr/share/libalpm/hooks.bin/snap-pac/.pre"
-for x in $configurations; do
-    if [ -f $prefile_prefix"_"$x ]; then
-        snapper --config $x create --cleanup-algorithm $cleanupalgo --type post --pre-number $(cat $prefile_prefix"_"$x) --description "$description"
-        rm $prefile_prefix"_"$x
-    else
-        echo "WARNING: $prefile_prefix"_"$x does not exist, so no post snapshot will be taken. If you are initially installing snap-pac, this is normal."
-    fi
-done
+source /usr/share/libalpm/hooks.bin/snap-pac/snap-pac; post
diff --git a/snapper-pre b/snapper-pre
index 1cb363e..ec434d7 100755
--- a/snapper-pre
+++ b/snapper-pre
@@ -20,16 +20,4 @@
 
 # Takes a snapper pre snapshot before a pacman transaction
 
-if [ -f /etc/snap-pac.conf ]; then
-    source /etc/snap-pac.conf
-else
-    echo "WARNING: /etc/snap-pac.conf is missing. Using default settings."
-fi
-
-declare -r cleanupalgo=${CLEANUP_ALGORITHM:-"number"}
-declare -r description=${POST_DESCRIPTION:-"$(echo $(ps -C pacman -o args=) | sed 'sX/usr/bin/pacmanXpacmanXg')"}
-declare -r configurations=${CONFIGS:-"root"}
-declare -r prefile_prefix="/usr/share/libalpm/hooks.bin/snap-pac/.pre"
-for x in $configurations; do
-    snapper --config $x create --type pre --cleanup-algorithm $cleanupalgo --print-number --description "$description" > $prefile_prefix"_"$x
-done
+source /usr/share/libalpm/hooks.bin/snap-pac/snap-pac; pre