Minor changes

1 files changed, 10 insertions, 8 deletions

diff --git a/sysdump.sh b/sysdump.sh
index 0d773d6..7bf34f9 100755
--- a/sysdump.sh
+++ b/sysdump.sh
@@ -168,9 +168,15 @@ ensure base64
 
 # Do dump
 [ "$ACTION" == "dump" ] && { sysdump; exit 0; }
+
+# Setting up dump file
 [ $(grep -c '#!#!#!#! SYSDUMP START HERE #!#!#!#' "$1") -ne 0 ] && cleandump "$1"
+# Setup safegetentry
+DUMP_FILE="$1"
+DUMP_ENTRIES=$(cat "${DUMP_FILE}"|jq -r "keys[]";)
+
 # List entries
-[ "$ACTION" == "list" ] && { ensure jq; cat "$1"|jq -r "keys[]"; exit 0; }
+[ "$ACTION" == "list" ] && { ensure jq; echo "$DUMP_ENTRIES"; exit 0; }
 # Parse dump file
 if [ "$ACTION" == "parse" ]
 then
@@ -182,24 +188,20 @@ then
 		for entry in $@
 		do
 			echo "====================> $entry"
-			cat "$file"|jq -r ".[\"${entry}\"]"|base64 -d
+			safegetentry ${entry}
 		done
 		exit 0
 	fi
 	while IFS= read -r entry; do
 		echo "====================> $entry"
-		cat "$file"|jq -r ".[\"${entry}\"]"|base64 -d
-	done <<< "$(cat "$file"|jq -r 'keys[]')"
+		safegetentry ${entry}
+	done <<< "${DUMP_ENTRIES}"
 	exit 0
 fi
 # Summarize dump file
 if [ "$ACTION" == "summarize" ]
 then
 	ensure jq
-	# Setup safegetentry
-	DUMP_FILE=$1
-	DUMP_ENTRIES=$(cat "${DUMP_FILE}"|jq -r "keys[]";)
-
 	OS_RELEASE=$(safegetentry /etc/os-release)
 	CPU_INFO=$(safegetentry /proc/cpuinfo)
 	MEM_INFO=$(safegetentry /proc/meminfo)