6.2-dev
This commit is contained in:
+17
-2
@@ -1,5 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# set -e # for testan, die on eelrror
|
# set -e # uncomment for die on error
|
||||||
startTime=$(date '+%s') # to time the (re)install time for the logs
|
startTime=$(date '+%s') # to time the (re)install time for the logs
|
||||||
|
|
||||||
gitBranch=master # branch from github
|
gitBranch=master # branch from github
|
||||||
@@ -19,7 +19,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
log=$installDir/install.log # log file
|
log=$installDir/install.log # log file
|
||||||
versionData=$installDir/version-data.txt # version data log file
|
versionData=$installDir/version-data.log # version data log file
|
||||||
idfDir=$installDir/esp-idf # esp-idf path
|
idfDir=$installDir/esp-idf # esp-idf path
|
||||||
espressifLocation=$HOME/.espressif # espressif tools install location
|
espressifLocation=$HOME/.espressif # espressif tools install location
|
||||||
customBinLocation=$installDir/.custom_bin # where custom bin scripts are placed
|
customBinLocation=$installDir/.custom_bin # where custom bin scripts are placed
|
||||||
@@ -83,6 +83,7 @@ rmExportBackupChk=0
|
|||||||
# set sleepMins int variable
|
# set sleepMins int variable
|
||||||
# redefine any other vars needed
|
# redefine any other vars needed
|
||||||
# handleStart
|
# handleStart
|
||||||
|
# handleClearInstallLog
|
||||||
# handleLogoutAllUsers
|
# handleLogoutAllUsers
|
||||||
# handleSetupEnvironment
|
# handleSetupEnvironment
|
||||||
# handleCustomBins
|
# handleCustomBins
|
||||||
@@ -460,6 +461,15 @@ function handleChk() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleClearInstallLog() {
|
||||||
|
if [ -f "$log" ]; then
|
||||||
|
echo -e "\nClearing install.log\n"
|
||||||
|
rm "$log"
|
||||||
|
else
|
||||||
|
echo "\n$log Not Found, Skipping Delete\n"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function handleEnd() {
|
function handleEnd() {
|
||||||
handleChk
|
handleChk
|
||||||
@@ -574,6 +584,7 @@ elif [[ "$arg" == "cron" || "$arg" == "c" ]]; then # full install with warn, sle
|
|||||||
sleepMins=0
|
sleepMins=0
|
||||||
|
|
||||||
handleStart
|
handleStart
|
||||||
|
handleClearInstallLog
|
||||||
handleLogoutAllUsers
|
handleLogoutAllUsers
|
||||||
handleSetupEnvironment
|
handleSetupEnvironment
|
||||||
handleCustomBins
|
handleCustomBins
|
||||||
@@ -594,7 +605,10 @@ elif [[ "$arg" == "nuke" || "$arg" == "n" ]]; then # clear logs
|
|||||||
action="REINSTALL (NUKE)"
|
action="REINSTALL (NUKE)"
|
||||||
idfGet="download"
|
idfGet="download"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
handleStart
|
handleStart
|
||||||
|
handleClearInstallLog
|
||||||
handleSetupEnvironment
|
handleSetupEnvironment
|
||||||
handleCustomBins
|
handleCustomBins
|
||||||
handleDownloadInstall
|
handleDownloadInstall
|
||||||
@@ -616,6 +630,7 @@ else # full noninteractive (re)install without logout, reboot, or sleeps
|
|||||||
action="REINSTALL (DEFAULT)"
|
action="REINSTALL (DEFAULT)"
|
||||||
|
|
||||||
handleStart
|
handleStart
|
||||||
|
handleClearInstallLog
|
||||||
handleSetupEnvironment
|
handleSetupEnvironment
|
||||||
handleCustomBins
|
handleCustomBins
|
||||||
handleDownloadInstall
|
handleDownloadInstall
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
6.1-dev
|
6.2-dev
|
||||||
Reference in New Issue
Block a user