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

60-beta2.3

Browse Source
This commit is contained in:
Princess Pi
2024-11-12 09:57:04 -07:00
parent 3464f94a3c
commit 81f4e89a8b
4 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reinstall-esp-idf.sh
+16 -18
View File
@@ -23,6 +23,13 @@ helpText=$runningDir/help.txt
scriptVers=$(cat $runningDir/version.txt) # make sure version.txt does NOT have newline
arg=$1 # just rename the argument var for clarity with the functions
# commands
gitCmd="git clone --jobs $gitJobs --branch $gitBranch --single-branch https://github.com/espressif/esp-idf $idfDir"
installCmd="$idfDir/install.sh all"
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
# full order:
# handleStart
# handleLogoutAllUsers
@@ -189,6 +196,8 @@ handleWarnAllUsers() {
loggedIn=$(who | awk '{print $1}' | uniq)
writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): Warning all logged in users:\n$lggedIn" # make sure dis workan
echo $loggedIn | while read line; do
echo -e "$warningString" | sudo write
done
@@ -202,6 +211,8 @@ function handleLogoutAllUsers() {
loggedIn=$(who | awk '{print $1}' | uniq)
writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): logging out all logged in users:\n$lggedIn" # make sure dis workan
echo $loggedIn | while read line; do
sudo loginctl terminate-user $line
done
@@ -315,12 +326,6 @@ elif [ "$arg" == "interactive" ]; then
writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): Interactive vars set:\n\tinstallDir: $installDir\n\tgitBranch: $gitBranch\n\trcFile: $rcFile\n\tgitJobs: $gitJobs"
gitCmd="git clone --jobs $gitJobs --branch $gitBranch --single-branch https://github.com/espressif/esp-idf $idfDir"
installCmd="$idfDir/install.sh all"
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
handleStart
handleSetupEnvironment
handleCustomBins
@@ -333,12 +338,6 @@ elif [ "$arg" == "interactive" ]; then
elif [ "$arg" == "cron" ]; then # full install with warn, sleep, and reboot
action="REINSTALL (CRON)"
gitCmd="git clone --jobs $gitJobs --branch $gitBranch --single-branch https://github.com/espressif/esp-idf $idfDir"
installCmd="$idfDir/install.sh all"
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
handleStart
handleLogoutAllUsers
@@ -352,14 +351,13 @@ elif [ "$arg" == "cron" ]; then # full install with warn, sleep, and reboot
exit
elif [ "$arg" == "clearlogs" ]; then # clear logs
handleEmptyLogs
exit
else # full noninteractive (re)install without logout, reboot, or sleeps
action="REINSTALL (DEFAULT)"
gitCmd="git clone --jobs $gitJobs --branch $gitBranch --single-branch https://github.com/espressif/esp-idf $idfDir"
installCmd="$idfDir/install.sh all"
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
handleStart
handleSetupEnvironment