From b5c5f155838a9f1eeb21a75da56d8f2eaccf6c7a Mon Sep 17 00:00:00 2001
From: PartialVolume <nick.craig.law@gmail.com>
Date: Fri, 29 Oct 2021 11:08:35 +0100
Subject: [PATCH] Updated nwipe package to v0.32. Modification to the
 nwipe_launcher in regards to user lftp export of logs

---
 board/shredos/fsoverlay/usr/bin/nwipe_launcher | 16 +++++++---------
 board/shredos/version.txt                      |  2 +-
 package/nwipe/nwipe.hash                       |  2 +-
 package/nwipe/nwipe.mk                         |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/board/shredos/fsoverlay/usr/bin/nwipe_launcher b/board/shredos/fsoverlay/usr/bin/nwipe_launcher
index e6db2c3d98..b37141f8b3 100755
--- a/board/shredos/fsoverlay/usr/bin/nwipe_launcher
+++ b/board/shredos/fsoverlay/usr/bin/nwipe_launcher
@@ -8,7 +8,6 @@ country_code=""
 nwipe_options_string=""
 lftp_command_line=""
 
-\rm lftp.log
 echo "[`date`] lftp log" > lftp.log
 
 # read the kernel command line for the loadkeys label for setting the correct keyboard layout
@@ -45,23 +44,24 @@ fi
 lftp_command_line=$(kernel_cmdline_extractor lftp)
 if [ $? == 0 ]
 then
-	echo "Found lftp commands on kernel command line, preparing lftp"
+	echo "[`date`] Found lftp commands on kernel command line in grub.cfg"
 	if [ ! -d "exported" ]; then
 		mkdir exported
-		echo "created exported directory"
+		echo "[`date`] created exported directory"
 	fi
-	echo "Executing users lftp commands"
+	echo "[`date`] Executing users lftp commands"
 	lftp -c "$lftp_command_line" >> lftp.log
 	if [ $? == 0 ]
 	then
-		echo "lftp completed sucessfully"
-		echo "moving nwipe logs to ../exported"
+		echo "[`date`] lftp completed sucessfully"
+		echo "[`date`] moving nwipe logs to ../exported"
 		mv nwipe_*.txt exported/
 	else
-		echo "[`date`] lftp command failed, lftp -c \"$lftp_command_line\" See lftp.log for details"
+		echo "[`date`] lftp command failed, See above and lftp.log for details"
 	fi
 fi
 
+printf ""
 printf "Paused, press a key to restart nwipe."
 read -rsn1 input
 sleep 1;
@@ -72,7 +72,5 @@ sleep 1;
 printf " 2"
 sleep 1
 printf " 1"
-sleep 1;
-printf " 0"
 done
 
diff --git a/board/shredos/version.txt b/board/shredos/version.txt
index 6228c97b46..ed6f0840b3 100644
--- a/board/shredos/version.txt
+++ b/board/shredos/version.txt
@@ -1,2 +1,2 @@
-2020.05.015_x86-64_0.31
+2020.05.016_x86-64_0.32
 
diff --git a/package/nwipe/nwipe.hash b/package/nwipe/nwipe.hash
index 1685214994..1e3cb7a4b0 100644
--- a/package/nwipe/nwipe.hash
+++ b/package/nwipe/nwipe.hash
@@ -1,2 +1,2 @@
-sha1	ce61feb2d0c14552bec64e536aadd161c2a3d2f1  nwipe-v0.31.tar.gz
+sha1	f921b439c6fe2564c4f55805e2d69e9b3410b4b7  nwipe-v0.32.tar.gz
  
diff --git a/package/nwipe/nwipe.mk b/package/nwipe/nwipe.mk
index 1651f06e2c..106a93822c 100644
--- a/package/nwipe/nwipe.mk
+++ b/package/nwipe/nwipe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NWIPE_VERSION = v0.31
+NWIPE_VERSION = v0.32
 NWIPE_SITE = $(call github,martijnvanbrummelen,nwipe,$(NWIPE_VERSION))
 NWIPE_DEPENDENCIES = ncurses parted dmidecode coreutils