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

qaetg24w3rt

Browse Source
This commit is contained in:
Princess Pi
2024-11-12 12:11:17 -07:00
parent 22c63de94f
commit cf8aa423f0
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reinstall-esp-idf.sh
+36 -18
View File
@@ -98,18 +98,18 @@ function handleExport() {
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" writeToLog "editing ${idfDir}/export.sh to remove ending \`return 0\`"
sed -i 's/return 0/# return 0/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" writeToLog "editing $idfDir/export.sh with version information: $versionData"
sed -i "s/versionTAG/'$versionData'/g" $idfDir/export.sh sed -i "s/versionTAG/\'$versionData\'/g" $idfDir/export.sh
returnStatus returnStatus
dateStampInstall=$(date '+%d/%m/%Y %H:%M:%S %Z (%s)') 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: $dateStampInstall"
sed -i "s/installDateTAG/'$dateStampInstall'/g" $idfDir/export.sh sed -i "s/installDateTAG/\'$dateStampInstall\'/g" $idfDir/export.sh
returnStatus returnStatus
} }
@@ -160,32 +160,50 @@ function handleDownloadInstall() {
eval "$gitCmd" eval "$gitCmd"
returnStatus returnStatus
# is this helpful in teh slightest? idk lel
if [ ! -z $(which python3) ]; then
writeToLog "python3 found at $(which python3), using"
idfPython="python3"
elif [! -z $(which python) ]; then
writeToLog "python found at $(which python), using"
idfPython="python"
else
writeToLog "no python found, aborting python tools install"
fi
writeToLog "installing with \`eval \"${idfDir}/install.sh all\"\`" writeToLog "installing with \`eval \"${idfDir}/install.sh all\"\`"
eval "$installCmd" eval "$installCmd"
returnStatus returnStatus
# not totes sure this is a worthwhile or helpful thing at all idk lmfao
# silly python envvar workans testant # silly python envvar workans testant
if [ -z $IDF_PYTHON_ENV_PATH ]; then #
writeToLog "IDF_PYTHON_ENV_PATH not set, setting to default ($(which python))" # if [ -z $IDF_PYTHON_ENV_PATH ]; then
idfPython=$(which python) # writeToLog "IDF_PYTHON_ENV_PATH not set, setting to default ($(which python))"
returnStatus # idfPython=$(which python)
else # returnStatus
writeToLog "IDF_PYTHON_ENV_PATH: $IDF_PYTHON_ENV_PATH" # else
idfPython=$IDF_PYTHON_ENV_PATH/bin/python # writeToLog "IDF_PYTHON_ENV_PATH: $IDF_PYTHON_ENV_PATH"
ls $idfPython # idfPython=$IDF_PYTHON_ENV_PATH/bin/python
returnStatus # ls $idfPython
fi # returnStatus
# fi
if [ -z $idfPython ]; then
writeToLog "installing tools with \`eval \"$idfPython $toolsInstallCmd\"\`" writeToLog "installing tools with \`eval \"$idfPython $toolsInstallCmd\"\`"
# eval "$idfPython $toolsInstallCmd"
eval "$idfPython $toolsInstallCmd" eval "$idfPython $toolsInstallCmd"
returnStatus returnStatus
else
writeToLog "No python found on system, skipping python tools install"
fi
writeToLog "getting the commit hash" writeToLog "getting the commit hash"
commitHash=$(git -C $idfDir rev-parse HEAD) commitHash=$(git -C $idfDir rev-parse HEAD)
returnStatus returnStatus
writeToLog "editing $idfDir/export.sh with git commit hash data" writeToLog "editing $idfDir/export.sh with git commit hash data: $commitHash"
sed -i "s/commitTAG/'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"
version.txt
+1 -1
View File
@@ -1 +1 @@
60-rc1.3 60-rc1.4