From 3bbe31119cae2e7a21012d33c544ac6a4038a031 Mon Sep 17 00:00:00 2001 From: PrincessPi3 Date: Wed, 13 Nov 2024 17:02:56 -0700 Subject: [PATCH] 6-prerelease6 --- reinstall-esp-idf.sh | 10 ++++++++-- todo.txt | 6 +++--- version.txt | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/reinstall-esp-idf.sh b/reinstall-esp-idf.sh index 70b5578..1a2dd17 100644 --- a/reinstall-esp-idf.sh +++ b/reinstall-esp-idf.sh @@ -71,6 +71,7 @@ customBinExecChk=0 cpCustomBinChk=0 rmCustomBinChk=0 sleepChk=0 +rmExportBackupChk=0 # full order: # set action string variable @@ -274,6 +275,11 @@ 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=$? + if [ -d "$idfDir" ]; then writeToLog "Deleting $idfDir" rm -rf $idfDir @@ -439,9 +445,9 @@ function handleEmptyLogs() { } function handleChk() { - retCodes="Error Checking:\n\tPackages install: $pkgInstallChk\n\tGit pull/clone: $gitChk\n\tInstall script: $installChk\n\tInstall tools: $toolsInstallChk\n\tExport append: $exportCatChk\n\tExport edit return: $exportSedReturnChk\n\tExport version: $exportSedVersionChk\n\tExport date: $exportSedDateChk\n\tExport git hash: $exportSedHashChk\n\trun_esp_reinstall alias: $aliasRunEspReinstallChk\n\tesp_monitor alias: $aliasEspMonitorchk\n\tesp_logs alias: $aliasEspLogsChk\n\tESPIDF_INSTALLDIR envvar: $aliasInstallDirChk\n\tWarned Users: $warnChk\n\tLogged out users: $logoutChk\n\tAppended git log to version-data.txt: $gitLogChk\n\tAcquired git hash: $gitHashChk\n\tDeleted esp-idf dir: $rmIdfDirChk\n\tDeleted .espressif dir: $rmEspressifChk\n\tCreated install dir: $mkInstallDirChk\n\tRestored export.sh.bak: $restoreExportScriptChk\n\tDeleted old export.sh: $rmExportScriptCh\n\tBacked up export.sh to export.sh.bak: $backupExportScriptChk\n\tMade custom scripts executable: $customBinExecChk\n\tCopied custom scripts: $cpCustomBinChk\n\tDeleted old custom scripts dir: $rmCustomBinChk\n\tWoke from sleep: $sleepChk" + retCodes="Error Checking:\n\tPackages install: $pkgInstallChk\n\tGit pull/clone: $gitChk\n\tInstall script: $installChk\n\tInstall tools: $toolsInstallChk\n\tExport append: $exportCatChk\n\tExport edit return: $exportSedReturnChk\n\tExport version: $exportSedVersionChk\n\tExport date: $exportSedDateChk\n\tExport git hash: $exportSedHashChk\n\trun_esp_reinstall alias: $aliasRunEspReinstallChk\n\tesp_monitor alias: $aliasEspMonitorchk\n\tesp_logs alias: $aliasEspLogsChk\n\tESPIDF_INSTALLDIR envvar: $aliasInstallDirChk\n\tWarned Users: $warnChk\n\tLogged out users: $logoutChk\n\tAppended git log to version-data.txt: $gitLogChk\n\tAcquired git hash: $gitHashChk\n\tDeleted esp-idf dir: $rmIdfDirChk\n\tDeleted .espressif dir: $rmEspressifChk\n\tCreated install dir: $mkInstallDirChk\n\tRestored export.sh.bak: $restoreExportScriptChk\n\tDeleted old export.sh: $rmExportScriptCh\n\tBacked up export.sh to export.sh.bak: $backupExportScriptChk\n\tDeleted backup export export.bak.sh: $rmExportBackupChk\n\tMade custom scripts executable: $customBinExecChk\n\tCopied custom scripts: $cpCustomBinChk\n\tDeleted old custom scripts dir: $rmCustomBinChk\n\tWoke from sleep: $sleepChk" - totalErrorLoad=$(($pkgInstallChk+$gitChk+$gitChk+$installChk+$toolsInstallChk+$exportSedHashChk+$exportCatChk+$exportSedReturnChk+$aliasRunEspReinstallChk+$aliasEspMonitorchk+$aliasEspLogsChk+$aliasInstallDirChk+$warnChk+$logoutChk+$gitLogChk+$gitHashChk+$rmIdfDirChk+$rmEspressifChk+$mkInstallDirChk+$restoreExportScriptChk+$rmExportScriptChk+$backupExportScriptChk+$customBinExecChk+$rmCustomBinChk+$sleepChk)) + totalErrorLoad=$(($pkgInstallChk+$gitChk+$gitChk+$installChk+$toolsInstallChk+$exportSedHashChk+$exportCatChk+$exportSedReturnChk+$aliasRunEspReinstallChk+$aliasEspMonitorchk+$aliasEspLogsChk+$aliasInstallDirChk+$warnChk+$logoutChk+$gitLogChk+$gitHashChk+$rmIdfDirChk+$rmEspressifChk+$mkInstallDirChk+$restoreExportScriptChk+$rmExportScriptChk+$backupExportScriptChk+$customBinExecChk+$rmCustomBinChk+$sleepChk+$rmExportBackupChk)) if [[ $totalErrorLoad < 2 ]]; then writeToLog "Installed Successfully, total error load: $totalErrorLoad" diff --git a/todo.txt b/todo.txt index 2ff1f95..5a21432 100644 --- a/todo.txt +++ b/todo.txt @@ -53,9 +53,9 @@ mayhaps support bash? figure out how to message users properly -bug: duplicate export added to export.sh - involves testExport prolly lol - issue be in retool +x bug: duplicate export added to export.sh +x involves testExport prolly lol +x issue be in retool verbosity levels? less verbose on git commands and installers? diff --git a/version.txt b/version.txt index daf164a..db0f931 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6-prerelease5 \ No newline at end of file +6-prerelease6 \ No newline at end of file