61-beta3.2
This commit is contained in:
+31
-2
@@ -33,6 +33,35 @@ installCmd="$idfDir/install.sh all"
|
||||
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
|
||||
idfGet="update" # default method
|
||||
|
||||
# default values for retcodes
|
||||
exportCatChk=0
|
||||
pkgInstallChk=0
|
||||
gitChk=0
|
||||
installChk=0
|
||||
toolsInstallChk=0
|
||||
exportSedReturnChk=0
|
||||
exportSedVersionChk=0
|
||||
exportSedDateChk=0
|
||||
exportSedHashChk=0
|
||||
aliasRunEspReinstallChk=0
|
||||
aliasEspMonitorchk=0
|
||||
aliasEspLogsChk=0
|
||||
aliasInstallDirChk=0
|
||||
warnChk=0
|
||||
logoutChk=0
|
||||
gitLogChk=0
|
||||
gitHashChk=0
|
||||
rmIdfDirChk=0
|
||||
rmEspressifChk=0
|
||||
mkInstallDirChk=0
|
||||
restoreExportScriptChk=0
|
||||
rmExportScriptChk=0
|
||||
backupExportScriptChk=0
|
||||
customBinExecChk=0
|
||||
cpCustomBinChk=0
|
||||
rmCustomBinChk=0
|
||||
sleepChk=0
|
||||
|
||||
# full order:
|
||||
# set action string variable
|
||||
# set sleepMins int variable
|
||||
@@ -437,9 +466,9 @@ 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"
|
||||
|
||||
echo -e "\n\nTotal Error Load:\n$pkgInstallChk+$gitChk+$gitChk+$installChk+$toolsInstallChk+$exportSedHashChk+$exportCatChk+$exportSedReturnChk+$aliasRunEspReinstallChk+$aliasEspMonitorchk+$aliasEspLogsChk+$aliasInstallDirChk+$warnChk+$logoutChk+$gitLogChk+$gitHashChk+$rmIdfDirChk+$rmEspressifChk+$mkInstallDirChk+$restoreExportScriptChk+$rmExportScriptCh+$backupExportScriptChk+$customBinExecChk+$rmCustomBinChk+$sleepChk\n\n"
|
||||
echo -e "\n\nTotal Error Load:\n$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\n\n"
|
||||
|
||||
# totalErrorLoad=$(($pkgInstallChk+$gitChk+$gitChk+$installChk+$toolsInstallChk+$exportSedHashChk+$exportCatChk+$exportSedReturnChk+$aliasRunEspReinstallChk+$aliasEspMonitorchk+$aliasEspLogsChk+$aliasInstallDirChk+$warnChk+$logoutChk+$gitLogChk+$gitHashChk+$rmIdfDirChk+$rmEspressifChk+$mkInstallDirChk+$restoreExportScriptChk+$rmExportScriptCh+$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))
|
||||
|
||||
if [[ $totalErrorLoad < 2 ]]; then
|
||||
writeToLog "Installed Successfully, total error load: $totalErrorLoad"
|
||||
|
||||
Reference in New Issue
Block a user