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

60-rc1.2

Browse Source
This commit is contained in:
Princess Pi
2024-11-12 11:45:09 -07:00
parent 4add95da8f
commit 3f1a9968fc
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
add-to-export-sh.txt
+3 -3
View File
@@ -7,9 +7,9 @@
echo "\n=======CUSTOM=======\n" echo "\n=======CUSTOM=======\n"
versionData="versionTAG" versionData=versionTAG
commitHash="commitTagTAG" commitHash=commitTAG
installDate="installDateTAG" installDate=installDateTAG
if [ -z $ESPIDF_INSTALLDIR ]; then if [ -z $ESPIDF_INSTALLDIR ]; then
echo "\nFAIL: ESPIDF_INSTALLDIR environment variable not found!\nReinstall via script or manually add to ~/.zshrc\n" echo "\nFAIL: ESPIDF_INSTALLDIR environment variable not found!\nReinstall via script or manually add to ~/.zshrc\n"
reinstall-esp-idf.sh
+18 -15
View File
@@ -28,7 +28,7 @@ gitCmd="git clone --jobs $gitJobs --branch $gitBranch --single-branch https://gi
installCmd="$idfDir/install.sh all" installCmd="$idfDir/install.sh all"
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all" toolsInstallCmd="$idfDir/tools/idf_tools.py install all"
# full order: # full order:
# set action string variable # set action string variable
@@ -91,23 +91,25 @@ function handleExport() {
writeToLog "Handling export.sh (function ran)" writeToLog "Handling export.sh (function ran)"
writeToLog "backing up ${idfDir}/export.sh to ${idfDir}/export.sh.bak" writeToLog "backing up ${idfDir}/export.sh to ${idfDir}/export.sh.bak"
cp $idfDir/export.sh $idfDir/export.sh.bakno cp $idfDir/export.sh $idfDir/export.sh.bak
returnStatus
writeToLog "editing ${idfDir}/export.sh"
sed -i 's/return 0/# return 0/g' $idfDir/export.sh
returnStatus returnStatus
writeToLog "adding ${runningDir}/add-to-export-sh.txt to ${idfDir}/export.sh" writeToLog "adding ${runningDir}/add-to-export-sh.txt to ${idfDir}/export.sh"
cat $runningDir/add-to-export-sh.txt >> $idfDir/export.sh cat $runningDir/add-to-export-sh.txt >> $idfDir/export.sh
returnStatus returnStatus
writeToLog "editing $idfDir/export.sh with version information" writeToLog "editing ${idfDir}/export.sh"
sed -i "s/versionTAG/${versionData}/g" $idfDir/export.sh sed -i 's/return 0/# return 0/g' $idfDir/export.sh
returnStatus returnStatus
writeToLog "editing $idfDir/export.sh with version information"
sed -i "s/versionTAG/'$versionData'/g" $idfDir/export.sh
returnStatus
dateStampInstall=$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')
writeToLog "editing $idfDir/export.sh with install date information" writeToLog "editing $idfDir/export.sh with install date information"
sed -i "s/versionTAG/$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')/g" $idfDir/export.sh sed -i "s/installDateTAG/'$dateStampInstall'/g" $idfDir/export.sh
returnStatus returnStatus
} }
@@ -158,7 +160,7 @@ function handleDownloadInstall() {
eval "$gitCmd" eval "$gitCmd"
returnStatus returnStatus
writeToLog "installing with ${idfDir}/install.sh all" writeToLog "installing with \`eval \"${idfDir}/install.sh all\"\`"
eval "$installCmd" eval "$installCmd"
returnStatus returnStatus
@@ -168,12 +170,13 @@ function handleDownloadInstall() {
return return
else else
writeToLog "IDF_PYTHON_ENV_PATH: $IDF_PYTHON_ENV_PATH" writeToLog "IDF_PYTHON_ENV_PATH: $IDF_PYTHON_ENV_PATH"
ls -lah $IDF_PYTHON_ENV_PATH/bin/python idfPython=$IDF_PYTHON_ENV_PATH/bin/python
ls $idfPython
returnStatus returnStatus
fi fi
writeToLog "installing tools with python ${idfDir}/tools/idf_tools.py install all" writeToLog "installing tools with \`eval \"$idfPython $toolsInstallCmd\"\`"
eval "$toolsInstallCmd" eval "$idfPython $toolsInstallCmd"
returnStatus returnStatus
writeToLog "getting the commit hash" writeToLog "getting the commit hash"
@@ -181,7 +184,7 @@ function handleDownloadInstall() {
returnStatus returnStatus
writeToLog "editing $idfDir/export.sh with git commit hash data" writeToLog "editing $idfDir/export.sh with git commit hash data"
sed -i "s/commitTagTAG/${commitHash}/g" $idfDir/export.sh sed -i "s/commitTAG/'commitHash'/g" $idfDir/export.sh
returnStatus returnStatus
gitDataLog="installed esp-idf from commit $commitHash from branch $gitBranch using $scriptVers" gitDataLog="installed esp-idf from commit $commitHash from branch $gitBranch using $scriptVers"
@@ -294,7 +297,7 @@ elif [ "$arg" == "test" -o "$arg" == "t" ]; then # minimal actions taken, echo t
installCmd="echo $idfDir/install.sh all" installCmd="echo $idfDir/install.sh all"
toolsInstallCmd="echo python $idfDir/tools/idf_tools.py install all" toolsInstallCmd="echo $idfDir/tools/idf_tools.py install all"
sleepMins=0 sleepMins=0
version.txt
+1 -1
View File
@@ -1 +1 @@
60-rc1.1 60-rc1.2