From cf789e96f4dd5bba9b6c7fd2e0937527021f813d Mon Sep 17 00:00:00 2001 From: PrincessPi3 Date: Tue, 12 Nov 2024 07:02:48 -0700 Subject: [PATCH] stickygrickus --- cron-reinstall-esp-idf.sh | 15 ++++++--------- version.txt | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cron-reinstall-esp-idf.sh b/cron-reinstall-esp-idf.sh index 7cdb29c..90dae68 100644 --- a/cron-reinstall-esp-idf.sh +++ b/cron-reinstall-esp-idf.sh @@ -1,5 +1,6 @@ #!/bin/bash -set -e # for testan, die on error +# set -e # for testan, die on error +startTime=$(date '+%s') # redo these notes: # testing: @@ -168,9 +169,11 @@ function handleLogoutAllUsers() { } function handleStart() { - startTime=$(date '+%s') + if [ -z $sleepMins ]; then + sleepMins="disabled" + fi - writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')\nvars:\n\tmyUser: $myUser\n\tscriptVers: $scriptVers\n\tversionData: $versionData\n\tlog: $log\n\tsleepMins: $sleepMins\n\tsleepSecs: $sleepSecs\n\tinstallDir: $installDir\n\tgitJobs: $gitJobs\n\tgitBranch: $gitBranch\n\tgitCmd: $gitCmd\n\trunningDir: $runningDir\n\tidfDir: $idfDir\n\tespressifLocation: $espressifLocation\n\tcustomBinLocation: $customBinLocation\n\tcustomBinFrom: $customBinFrom\n\tinstallCmd: $installCmd\n\ttoolsInstallCmd: $toolsInstallCmd" + writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')\nvars:\n\tmyUser: $myUser\n\tscriptVers: $scriptVers\n\tversionData: $versionData\n\tlog: $log\n\tsleepMins: $sleepMins\n\tinstallDir: $installDir\n\tgitJobs: $gitJobs\n\tgitBranch: $gitBranch\n\tgitCmd: $gitCmd\n\trunningDir: $runningDir\n\tidfDir: $idfDir\n\tespressifLocation: $espressifLocation\n\tcustomBinLocation: $customBinLocation\n\tcustomBinFrom: $customBinFrom\n\tinstallCmd: $installCmd\n\ttoolsInstallCmd: $toolsInstallCmd" writeToLog " === $(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): new ${action} ===" writeToLog "Version: ${scriptVers}" @@ -238,8 +241,6 @@ elif [ "$arg" == "nologout" ]; then toolsInstallCmd="python $idfDir/tools/idf_tools.py install all" - sleepMins=0 - handleStart handleSetupEnvironment handleCustomBins @@ -251,8 +252,6 @@ elif [ "$arg" == "nologout" ]; then elif [ "$arg" == "retool" ]; then action="RETOOL" - sleepMins=0 - handleStart handleCustomBins handleExport @@ -268,8 +267,6 @@ else # full install with warn, sleep, and reboot toolsInstallCmd="python $idfDir/tools/idf_tools.py install all" - sleepMins=0 - handleStart handleLogoutAllUsers handleSetupEnvironment diff --git a/version.txt b/version.txt index e4b25ef..e52165b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -60-dev.2 \ No newline at end of file +60-dev.3 \ No newline at end of file