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

60-rc1.6.3

Browse Source
This commit is contained in:
Princess Pi
2024-11-12 12:55:44 -07:00
parent c888a74c1e
commit 2e26f3d319
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reinstall-esp-idf.sh
+10 -10
View File
@@ -51,7 +51,7 @@ toolsInstallCmd="$idfDir/tools/idf_tools.py install all"
function returnStatus() { function returnStatus() {
strii="\treturn status: ${?}" strii="\treturn status: ${?}"
echo -e "$strii\n" echo -e "$strii\n"
echo -e "$strii\n" >> $log echo -e "$strii" >> $log
} }
function writeToLog() { function writeToLog() {
@@ -110,8 +110,8 @@ function handleExport() {
returnStatus returnStatus
fi fi
writeToLog "adding ${runningDir}/add-to-export-sh.txt to ${idfDir}/export.sh" writeToLog "adding $runningDir/add-to-export-sh.txt to $exportScript"
cat $runningDir/add-to-export-sh.txt >> $idfDir/export.sh cat $runningDir/add-to-export-sh.txt >> $exportScript
returnStatus returnStatus
writeToLog "editing $exportScript to remove ending \`return 0\`" writeToLog "editing $exportScript to remove ending \`return 0\`"
@@ -127,6 +127,10 @@ function handleExport() {
writeToLog "editing $exportScript with install date information: $dateStampInstall" writeToLog "editing $exportScript with install date information: $dateStampInstall"
sed -i "s/installDateTAG/\'$dateStampInstall\'/g" $exportScript sed -i "s/installDateTAG/\'$dateStampInstall\'/g" $exportScript
returnStatus returnStatus
writeToLog "editing $exportScript with git commit hash data: $commitHash"
sed -i "s/commitTAG/\'$commitHash\'/g" $exportScript
returnStatus
} }
function handleSetupEnvironment() { function handleSetupEnvironment() {
@@ -172,7 +176,7 @@ function handleAliasEnviron() {
function handleDownloadInstall() { function handleDownloadInstall() {
writeToLog "Handling download and install (function ran)" writeToLog "Handling download and install (function ran)"
writeToLog "cloning git branch ${gitBranch} with ${gitJobs} jobs to ${idfDir}" writeToLog "cloning git branch $gitBranch with $gitJobs jobs to $idfDir"
eval "$gitCmd" eval "$gitCmd"
returnStatus returnStatus
@@ -218,10 +222,6 @@ function handleDownloadInstall() {
commitHash=$(git -C $idfDir rev-parse HEAD) commitHash=$(git -C $idfDir rev-parse HEAD)
returnStatus returnStatus
writeToLog "editing $exportScript with git commit hash data: $commitHash"
sed -i "s/commitTAG/\'$commitHash\'/g" $exportScript
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"
writeToLog "$gitDataLog" writeToLog "$gitDataLog"
echo -e "$gitDataLog" >> $versionData echo -e "$gitDataLog" >> $versionData
@@ -293,11 +293,11 @@ function handleStart() {
fi fi
if [ "$arg" != "interactive" -a "$arg" != "i" ]; then if [ "$arg" != "interactive" -a "$arg" != "i" ]; then
writeToLog "\n === new ${action} ===" writeToLog " === new ${action} ==="
writeToLog "\tVersion: ${scriptVers}\n" writeToLog "\tVersion: ${scriptVers}\n"
fi fi
writeToLog "\nvars:\n\tuser: $USER\n\tscriptVers: $scriptVers\n\tversionData: $versionData\n\tlog: $log\n\tsleepMins: $sleepMins\n\tinstallDir: $installDir\n\tgitJobs: $gitJobs\n\tgitBranch: $gitBranch\n\tgitCmd: $gitCmd\n\trunningDir: $runningDir\n\tidfDir: $idfDir\n\tespressifLocation: $espressifLocation\n\tcustomBinLocation: $customBinLocation\n\tcustomBinFrom: $customBinFrom\n\tinstallCmd: $installCmd\n\ttoolsInstallCmd: $toolsInstallCmd\n\trcFile: $rcFile\n\t(envvar) ESPIDF_INSTALLDIR: $installDirEnvvar" writeToLog "vars:\n\tuser: $USER\n\tscriptVers: $scriptVers\n\tversionData: $versionData\n\tlog: $log\n\tsleepMins: $sleepMins\n\tinstallDir: $installDir\n\tgitJobs: $gitJobs\n\tgitBranch: $gitBranch\n\tgitCmd: $gitCmd\n\trunningDir: $runningDir\n\tidfDir: $idfDir\n\tespressifLocation: $espressifLocation\n\tcustomBinLocation: $customBinLocation\n\tcustomBinFrom: $customBinFrom\n\tinstallCmd: $installCmd\n\ttoolsInstallCmd: $toolsInstallCmd\n\trcFile: $rcFile\n\t(envvar) ESPIDF_INSTALLDIR: $installDirEnvvar"
} }
function handleEmptyLogs() { function handleEmptyLogs() {
version.txt
+1 -1
View File
@@ -1 +1 @@
60-rc1.6.2 60-rc1.6.3