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

61-dev1.3

Browse Source
This commit is contained in:
Princess Pi
2024-11-12 16:47:17 -07:00
parent bb09ebf488
commit 1e57718593
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reinstall-esp-idf.sh
+20 -16
View File
@@ -26,14 +26,11 @@ scriptVers=$(cat $runningDir/version.txt) # make sure version.txt does NOT have
arg=$1 # just rename the argument var for clarity with the functions arg=$1 # just rename the argument var for clarity with the functions
# commands # commands
gitCloneCmd="git clone --recursive --jobs $gitJobs --branch $gitBranch https://github.com/espressif/esp-idf $idfDir" # no --single-branch gitCloneCmd="git clone --recursive --jobs $gitJobs --branch $gitBranch https://github.com/espressif/esp-idf $idfDir"
# gitCmd="git clone --recursive --jobs $gitJobs --branch $gitBranch --single-branch https://github.com/espressif/esp-idf $idfDir"
gitUpdateCmd="git -C $idfDir reset --hard; git -C $idfDir clean -df; git -C $idfDir pull $idfDir" # mayhapsnasst? gitUpdateCmd="git -C $idfDir reset --hard; git -C $idfDir clean -df; git -C $idfDir pull $idfDir" # mayhapsnasst?
installCmd="$idfDir/install.sh all" installCmd="$idfDir/install.sh all"
toolsInstallCmd="$idfDir/tools/idf_tools.py install all" toolsInstallCmd="$idfDir/tools/idf_tools.py install all"
idfGet="update" # default method
# full order: # full order:
# set action string variable # set action string variable
@@ -201,20 +198,20 @@ function handleAliasEnviron() {
function handleDownloadInstall() { function handleDownloadInstall() {
writeToLog "Handling download and install (function ran)" writeToLog "Handling download and install (function ran)"
if [ "$idfGet" == "download" ]; then if [ "$idfGet" == "download" -o ! -d "$idfDir" ]; then
if [ -d $fullWipe ]; then if [ ! -d "$idfDir" ]; then
writeToLog "deleting $idfDir" writeToLog "deleting $idfDir"
rm -rf $idfDir rm -rf $idfDir
returnStatus returnStatus
else else
writeToLog "$idfDir not found, skipping delete" writeToLog "$idfDir not found, skipping delete"
fi fi
writeToLog "CLONING git branch $gitBranch with $gitJobs jobs to $idfDir" writeToLog "CLONING esp-idf, branch $gitBranch with $gitJobs jobs to $idfDir"
eval "$gitCloneCmd" eval "$gitCloneCmd"
returnStatus returnStatus
else else
writeToLog "UPDATING git branch $gitBranch with $gitJobs jobs to $idfDir" writeToLog "UPDATING esp-idf, branch $gitBranch with $gitJobs jobs to $idfDir"
eval "$gitUpdateCmd" eval "$gitUpdateCmd"
returnStatus returnStatus
fi fi
@@ -335,11 +332,21 @@ function handleStart() {
} }
function handleEmptyLogs() { function handleEmptyLogs() {
echo "Deleting $log"
rm -f $log rm -f $log
touch $log echo -e "\treturn status: ${?}\n"
echo "Deleting $versionData"
rm -f $versionData rm -f $versionData
echo -e "\treturn status: ${?}\n"
echo "Creating empty file at $log"
touch $log
echo "\treturn status: ${?}\n"
echo "Creating empty file at $versionData"
touch $versionData touch $versionData
echo -e "\treturn status: ${?}\n"
} }
function handleEnd() { function handleEnd() {
@@ -361,7 +368,6 @@ elif [ "$arg" == "test" -o "$arg" == "t" ]; then # minimal actions taken, echo t
action="TEST" action="TEST"
sleepMins=0 sleepMins=0
testExport=1 testExport=1
idfGet="update"
installCmdTemp="echo $installCmd" installCmdTemp="echo $installCmd"
toolsInstallCmdTemp="echo $toolsInstallCmd" toolsInstallCmdTemp="echo $toolsInstallCmd"
@@ -451,7 +457,6 @@ elif [ "$arg" == "interactive" -o "$arg" == "i" ]; then
elif [ "$arg" == "cron" -o "$arg" == "c" ]; then # full install with warn, sleep, and reboot elif [ "$arg" == "cron" -o "$arg" == "c" ]; then # full install with warn, sleep, and reboot
action="REINSTALL (CRON)" action="REINSTALL (CRON)"
idfGet="update"
sleepMins=3 sleepMins=3
handleStart handleStart
@@ -487,7 +492,6 @@ elif [ "$arg" == "nuke" -o "$arg" == "n" ]; then # clear logs
else # full noninteractive (re)install without logout, reboot, or sleeps else # full noninteractive (re)install without logout, reboot, or sleeps
action="REINSTALL (DEFAULT)" action="REINSTALL (DEFAULT)"
idfGet="update"
handleStart handleStart
handleSetupEnvironment handleSetupEnvironment
version.txt
+1 -1
View File
@@ -1 +1 @@
61-dev1.2 61-dev1.3