From 401da9582d7946774a415448633ec550a5fa7572 Mon Sep 17 00:00:00 2001
From: Cody Cook <gitlab@codycook.us>
Date: Mon, 8 Oct 2018 22:27:39 -0700
Subject: [PATCH] Add shellcheck fixes and enhancements

---
 .gitlab-ci.yml      |  2 +-
 share_lun_ui_fix.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 111fcb7..d48c469 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
 shellcheck:
   stage: build
   script:
-    - /usr/bin/shellcheck share_lun_ui_fix.sh
\ No newline at end of file
+    - /usr/bin/shellcheck -e SC2164,SC2086 share_lun_ui_fix.sh
\ No newline at end of file
diff --git a/share_lun_ui_fix.sh b/share_lun_ui_fix.sh
index 3c3cce6..6ac36ed 100755
--- a/share_lun_ui_fix.sh
+++ b/share_lun_ui_fix.sh
@@ -133,8 +133,8 @@ EOF
 }
 
 backup_configs() {
-cd "/$volume/._share/"
-tar -cf "/var/backups/$volume_sharelunconfig.$(date +%s).tar" ./* 2>/dev/null
+cd "/$volume/._share/" 
+tar -cf "/var/backups/$volume.sharelunconfig.$(date +%s).tar" ./* 2>/dev/null
 }
 
 echo "==============================="
@@ -168,12 +168,13 @@ else
 	echo "==============================="
 	for volume in $x; do
 		echo "= Investigating volume /$volume..."
-		objects=$(cd /"$volume"; ls -dA */ 2>/dev/null)
+		objects=$(cd /"$volume"; ls -dA ./*/ 2>/dev/null)
 		if [[ $? == 2 ]]; then
 			echo "No shares or LUNs found."
 		else
-			objects=$(echo "$objects" |egrep -v "^.apps\/$|^home\/$|^.purge\/$|^._share\/$|^.timemachine\/$|^.vault\/$|^.TemporaryItems\/$" | sed 's/\/$//')
-		        echo "= Objects found:" $objects
+			objects=$(echo "$objects" |egrep -v "^.apps\/$|^home\/$|^.purge\/$|^._share\/$|^.timemachine\/$|^.vault\/$|^.TemporaryItems\/$" | sed 's/\/$//;s/\.\///')
+		        echo "= Objects found: $(echo $objects | wc -w)"
+		        echo $objects
 			backup_configs
 		        for item in $objects; do
 		                echo "== Reviewing $item"