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