PrincessPi/esp-idf-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6-prerelease6

Browse Source
This commit is contained in:
Princess Pi
2024-11-13 17:02:56 -07:00
parent 4b56559b61
commit 3bbe31119c
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reinstall-esp-idf.sh
+8 -2
View File
@@ -71,6 +71,7 @@ customBinExecChk=0
cpCustomBinChk=0 cpCustomBinChk=0
rmCustomBinChk=0 rmCustomBinChk=0
sleepChk=0 sleepChk=0
rmExportBackupChk=0
# full order: # full order:
# set action string variable # set action string variable
@@ -274,6 +275,11 @@ 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"
rm -f $exportBackupScript
returnStatus
rmExportBackupChk=$?
if [ -d "$idfDir" ]; then if [ -d "$idfDir" ]; then
writeToLog "Deleting $idfDir" writeToLog "Deleting $idfDir"
rm -rf $idfDir rm -rf $idfDir
@@ -439,9 +445,9 @@ function handleEmptyLogs() {
} }
function handleChk() { 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 if [[ $totalErrorLoad < 2 ]]; then
writeToLog "Installed Successfully, total error load: $totalErrorLoad" writeToLog "Installed Successfully, total error load: $totalErrorLoad"
todo.txt
+3 -3
View File
@@ -53,9 +53,9 @@ mayhaps support bash?
figure out how to message users properly figure out how to message users properly
bug: duplicate export added to export.sh x bug: duplicate export added to export.sh
involves testExport prolly lol x involves testExport prolly lol
issue be in retool x issue be in retool
verbosity levels? verbosity levels?
less verbose on git commands and installers? less verbose on git commands and installers?
version.txt
+1 -1
View File
@@ -1 +1 @@
6-prerelease5 6-prerelease6