This commit is contained in:
2024-11-12 06:57:15 -07:00
parent 3e3b823c61
commit 6a1c8913da
2 changed files with 12 additions and 4 deletions
+11 -3
View File
@@ -27,6 +27,7 @@ runningDir="$( cd "$( dirname "$0" )" && pwd )"
customBinFrom=$runningDir/custom_bin customBinFrom=$runningDir/custom_bin
# cronVers=55-dev.3 # version of this script # cronVers=55-dev.3 # version of this script
scriptVers=$(cat $runningDir/version.txt) # make sure version.txt does NOT have newline scriptVers=$(cat $runningDir/version.txt) # make sure version.txt does NOT have newline
arg=$1 arg=$1
function returnStatus() { function returnStatus() {
@@ -41,7 +42,9 @@ function writeToLog() {
} }
function sleepHold() { function sleepHold() {
sleepSecs=$((sleepMins*60)) # calculated seconds of warning to wait for user to log out writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): Handling sleep hold (function ran)"
sleepSecs=$(($sleepMins*60)) # calculated seconds of warning to wait for user to log out
writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): sleeping ${sleepMins} minutes" writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): sleeping ${sleepMins} minutes"
sleep $sleepSecs sleep $sleepSecs
@@ -200,8 +203,7 @@ function handleEnd() {
# handleCustomBins # handleCustomBins
# handleDownloadInstall # handleDownloadInstall
# handleExport # handleExport
# handleWarn # handleLogoutAllUsers
# sleepHold
# handleEnd # handleEnd
# handleReboot # handleReboot
# exit # exit
@@ -236,6 +238,8 @@ elif [ "$arg" == "nologout" ]; then
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all" toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
sleepMins=0
handleStart handleStart
handleSetupEnvironment handleSetupEnvironment
handleCustomBins handleCustomBins
@@ -247,6 +251,8 @@ elif [ "$arg" == "nologout" ]; then
elif [ "$arg" == "retool" ]; then elif [ "$arg" == "retool" ]; then
action="RETOOL" action="RETOOL"
sleepMins=0
handleStart handleStart
handleCustomBins handleCustomBins
handleExport handleExport
@@ -262,6 +268,8 @@ else # full install with warn, sleep, and reboot
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all" toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
sleepMins=0
handleStart handleStart
handleLogoutAllUsers handleLogoutAllUsers
handleSetupEnvironment handleSetupEnvironment
+1 -1
View File
@@ -1 +1 @@
60-dev.1 60-dev.2