From c1c8a0b4a2bc61221d907d033c63e967e2e84d30 Mon Sep 17 00:00:00 2001
From: framp <framp@linux-tips-and-tricks.de>
Date: Sat, 23 May 2020 11:11:49 +0200
Subject: [PATCH 1/2] Fixed required tools bug

---
 pishrink.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pishrink.sh b/pishrink.sh
index 7e308aa..ce8754b 100755
--- a/pishrink.sh
+++ b/pishrink.sh
@@ -91,7 +91,6 @@ parallel=false
 verbose=false
 prep=false
 ziptool=""
-required_tools="$REQUIRED_TOOLS"
 
 while getopts ":adhprsvzZ" opt; do
   case "${opt}" in
@@ -142,7 +141,7 @@ if [[ -n $ziptool ]]; then
 		error $LINENO "$ziptool is an unsupported ziptool."
 		exit -17
 	else
-		if [[ $parallel == true && ziptool == "gzip" ]]; then
+		if [[ $parallel == true && $ziptool == "gzip" ]]; then
 			REQUIRED_TOOLS="$REQUIRED_TOOLS pigz"
 		else
 			REQUIRED_TOOLS="$REQUIRED_TOOLS $ziptool"

From 198e6c944f23cd911766d64b0409ddf2daa485f5 Mon Sep 17 00:00:00 2001
From: framp <framp@linux-tips-and-tricks.de>
Date: Sat, 23 May 2020 11:40:53 +0200
Subject: [PATCH 2/2] Remove zip extension in target

---
 pishrink.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pishrink.sh b/pishrink.sh
index ce8754b..1e17bdd 100755
--- a/pishrink.sh
+++ b/pishrink.sh
@@ -160,15 +160,19 @@ done
 
 #Copy to new file if requested
 if [ -n "$2" ]; then
-  info "Copying $1 to $2..."
-  cp --reflink=auto --sparse=always "$1" "$2"
+  f="$2"
+  if [[ -n $ziptool && "${f##*.}" == ${ZIPEXTENSIONS[$ziptool]} ]]; then	# remove zip extension if zip requested because zip tool will complain about extension
+    f="${f%.*}"
+  fi
+  info "Copying $1 to $f..."
+  cp --reflink=auto --sparse=always "$1" "$f"
   if (( $? != 0 )); then
     error $LINENO "Could not copy file..."
     exit -5
   fi
   old_owner=$(stat -c %u:%g "$1")
-  chown "$old_owner" "$2"
-  img="$2"
+  chown "$old_owner" "$f"
+  img="$f"
 fi
 
 # cleanup at script exit