From 94a78681b746ff5cb329767d6b59cd43d5c7c7b4 Mon Sep 17 00:00:00 2001
From: James Barnett <wes@wbarnett.us>
Date: Mon, 22 Jan 2018 12:12:14 -0500
Subject: [PATCH] fix link modules functionality

---
 man8/snap-pac.8  | 4 ----
 scripts/snap-pac | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/man8/snap-pac.8 b/man8/snap-pac.8
index 5fb1271..da867ad 100644
--- a/man8/snap-pac.8
+++ b/man8/snap-pac.8
@@ -54,9 +54,6 @@ Number of characters to limit length of descriptions used for snapper.
 Default is "48".
 .RE
 
-<<<<<<< HEAD
-The following are settings used on each specific snapper
-=======
 \fBLINK_MODULES=\fR\fB\fIyes\fR\fR\fB or \fR\fB\fIno\fR\fR
 .RS 4
 When set to "yes" this, if the \fIlinux\fR package (or another package
@@ -77,7 +74,6 @@ Default is "linux".
 .RE
 
 The following are possible settings used on each specific snapper
->>>>>>> modules
 configuration you have. To use them, first create the folder
 \fI/etc/snap-pac\fR if it does not already exist. Then create a file
 for the snapper configuration file you want these settings to apply
diff --git a/scripts/snap-pac b/scripts/snap-pac
index 8e72e4d..f82ef27 100755
--- a/scripts/snap-pac
+++ b/scripts/snap-pac
@@ -76,7 +76,6 @@ truncate_description() {
 package_updated() {
     check="$1"
     for x in ${packages[@]}; do
-        echo $x
         if [[ "$x" == "$check" ]]; then
             echo "yes"
             return
@@ -97,7 +96,7 @@ read_config "$SNAPPAC_CONFIG_FILE"
 readonly DESC_LIMIT=${DESC_LIMIT:-48}
 readonly ABORT_ON_FAIL=${ABORT_ON_FAIL:-"no"}
 readonly LINK_MODULES=${LINK_MODULES:-"no"}
-readonly KERNEL_PACKAGE=${KERNEL_PACKAGE=-"linux"}
+readonly KERNEL_PACKAGE=${KERNEL_PACKAGE:-"linux"}
 
 mapfile -t packages
 kernel_updated=$(package_updated "$KERNEL_PACKAGE")