From 198c012ba0a9bc44673807958f89cbec9828012d Mon Sep 17 00:00:00 2001
From: PrincessPi3 <human.bagel@gmail.com>
Date: Wed, 13 Nov 2024 17:32:54 -0700
Subject: [PATCH] 6-prerelease6.1

---
 reinstall-esp-idf.sh | 57 ++++++++++++++++++++++++++------------------
 todo.txt             | 13 +++++-----
 version.txt          |  2 +-
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/reinstall-esp-idf.sh b/reinstall-esp-idf.sh
index 1a2dd17..5ea3ff8 100644
--- a/reinstall-esp-idf.sh
+++ b/reinstall-esp-idf.sh
@@ -161,26 +161,36 @@ function handleCustomBins() {
 }
 
 function handleExport() {
-	# writeToLog "Handling $exportScript (function ran)\n"
-	if [ -z $testExport ]; then
-		writeToLog "testExport not set\n"
-		writeToLog "Backing up $exportScript to $exportBackupScript"
-		cp $exportScript $exportBackupScript 2>/dev/null
-		returnStatus
-		backupExportScriptChk=$?
-	else
-		writeToLog "testExport export is set\n"
+#	# writeToLog "Handling $exportScript (function ran)\n"
+#	if [ -z $testExport ]; then
+#		writeToLog "testExport not set\n"
+#		writeToLog "Backing up $exportScript to $exportBackupScript"
+#		cp $exportScript $exportBackupScript 2>/dev/null
+#		returnStatus
+#		backupExportScriptChk=$?
+#	else
+#		writeToLog "testExport export is set\n"
+#
+#		writeToLog "Deleting $exportScript"
+#		rm -f $exportScript
+#		returnStatus
+#		rmExportScriptChk=$?
+#
+#		writeToLog "Restoring $exportScript from backup at $exportBackupScript"
+#		cp $exportBackupScript $exportScript
+#		returnStatus
+#		restoreExportScriptChk=$?
+#	fi
 
-		writeToLog "Deleting $exportScript"
-		rm -f $exportScript
-		returnStatus
-		rmExportScriptChk=$?
+	writeToLog "Deleting $exportBackupScript"
+	rm -f $exportBackupScript
+	returnStatus
+	rmExportBackupChk=$?
 
-		writeToLog "Restoring $exportScript from backup at $exportBackupScript"
-		cp $exportBackupScript $exportScript
-		returnStatus
-		restoreExportScriptChk=$?
-	fi
+	writeToLog "Backing up $exportScript to $exportBackupScript"
+	cp $exportScript $exportBackupScript
+	returnStatus
+	backupExportScriptChk=$?
 
 	writeToLog "Appending $runningDir/add-to-export-sh.txt to $exportScript"
 	echo cat $runningDir/add-to-export-sh.txt >> $exportScript
@@ -275,10 +285,10 @@ function handleDownloadInstall() {
 	if [[ "$idfGet" == "download" || ! -d "$idfDir" ]]; then
 		writeToLog "Setting for download mode\n"
 
-		writeToLog "Deleting backup export script $exportBackupScript"
-		rm -f $exportBackupScript
-		returnStatus
-		rmExportBackupChk=$?
+		# writeToLog "Deleting backup export script $exportBackupScript"
+		# rm -f $exportBackupScript
+		# returnStatus
+		# rmExportBackupChk=$?
 
 		if [ -d "$idfDir" ]; then
 			writeToLog "Deleting $idfDir"
@@ -567,7 +577,8 @@ elif [[ "$arg" == "interactive" || "$arg" == "i" ]]; then
 
 elif [[ "$arg" == "cron" || "$arg" == "c" ]]; then # full install with warn, sleep, and reboot
 	action="REINSTALL (CRON)"
-	sleepMins=3
+	# sleepMins=3
+	sleepMins=0
 
 	handleStart
 	handleLogoutAllUsers
diff --git a/todo.txt b/todo.txt
index 5a21432..bafe6cb 100644
--- a/todo.txt
+++ b/todo.txt
@@ -26,6 +26,9 @@ x alias add and document too
 x test reinstall from zero
 x fix dat nuke issue on line ~307 # fixed?
 x standardize the capatilization and format and content of notes
+x bug: duplicate export added to export.sh
+x     involves testExport prolly lol
+x     issue be in retool
 
 
 testan:
@@ -35,8 +38,8 @@ testan:
     x bash reinstall-esp-idf.sh h
     x bash reinstall-esp-idf.sh test
     x bash reinstall-esp-idf.sh t
-    b bash reinstall-esp-idf.sh retool
-    b bash reinstall-esp-idf.sh rt
+    x bash reinstall-esp-idf.sh retool
+    x bash reinstall-esp-idf.sh rt
     x bash reinstall-esp-idf.sh
     x bash reinstall-esp-idf.sh clearlogs
     x bash reinstall-esp-idf.sh clear
@@ -50,12 +53,10 @@ testan:
     bash reinstall-esp-idf.sh c
 
 mayhaps support bash?
+    # mayhaps it already works mayhaps? test
 
 figure out how to message users properly
-
-x bug: duplicate export added to export.sh
-x     involves testExport prolly lol
-x     issue be in retool
+    x at leastt remove sleeps if cant message ig lol
 
 verbosity levels?
     less verbose on git commands and installers?
diff --git a/version.txt b/version.txt
index db0f931..a616105 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-6-prerelease6
\ No newline at end of file
+6-prerelease6.1
\ No newline at end of file