new shit or whatever idgaf make me
This commit is contained in:
+6
-1
@@ -35,4 +35,9 @@
|
|||||||
fixed cron bug
|
fixed cron bug
|
||||||
|
|
||||||
1.0-release-r2
|
1.0-release-r2
|
||||||
fixed fullclean bug
|
fixed fullclean bug
|
||||||
|
|
||||||
|
1.1-dev-1
|
||||||
|
added downloads and updates of espressif's esp-dev-kits repo (https://github.com/espressif/esp-dev-kits)
|
||||||
|
patch-esp-idf added
|
||||||
|
a shortcut for applying esp-idf patches
|
||||||
@@ -3,8 +3,6 @@ echo -e "\nCleaning up Fully\n"
|
|||||||
|
|
||||||
echo -e "\nRunning fullclean\n"
|
echo -e "\nRunning fullclean\n"
|
||||||
|
|
||||||
idf.py fullclean
|
|
||||||
|
|
||||||
if [ -d build ]; then
|
if [ -d build ]; then
|
||||||
echo -e "\nDeleting build dir\n"
|
echo -e "\nDeleting build dir\n"
|
||||||
rm -rf build
|
rm -rf build
|
||||||
@@ -35,6 +33,6 @@ if [ -f dependencies.lock ]; then
|
|||||||
rm -f dependencies.lock
|
rm -f dependencies.lock
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e "\nAll done :3\n"
|
idf.py fullclean
|
||||||
|
|
||||||
dependencies
|
echo -e "\nAll done :3\n"
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
echo -e "\napplyan a patch~ $1 to $ESPIDFTOOLS_INSTALLDIR/esp-idf\n"
|
||||||
|
cp "$1" "$ESPIDFTOOLS_INSTALLDIR/esp-idf"
|
||||||
|
git -C "$ESPIDFTOOLS_INSTALLDIR/esp-idf" apply "$1"
|
||||||
|
echo -e "\nall donseies~\n"
|
||||||
+28
-3
@@ -88,6 +88,8 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
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?
|
||||||
|
gitDevKits="git clone --recursive https://github.com/espressif/esp-dev-kits.git $installDir/esp-dev-kits"
|
||||||
|
gitDevKitsUpdate="git -C $installDir/esp-dev-kits reset --hard; git -C $installDir/esp-dev-kits clean -df; git -C $installDir/esp-dev-kits pull"
|
||||||
installCmd="$idfDir/install.sh all"
|
installCmd="$idfDir/install.sh all"
|
||||||
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
|
toolsInstallCmd="python $idfDir/tools/idf_tools.py install all"
|
||||||
idfGet="update" # default method
|
idfGet="update" # default method
|
||||||
@@ -294,6 +296,8 @@ function handleSetupEnvironment() {
|
|||||||
writeToLog "$espressifLocation not found, skipping delete for reinstall\n"
|
writeToLog "$espressifLocation not found, skipping delete for reinstall\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function testAppendAlias() {
|
function testAppendAlias() {
|
||||||
@@ -333,22 +337,43 @@ function handleDownloadInstall() {
|
|||||||
writeToLog "$idfDir not found, skipping delete\n"
|
writeToLog "$idfDir not found, skipping delete\n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -d "$installDir/esp-dev-kits" ]; then
|
||||||
|
writeToLog "$installDir/esp-dev-kits found, deleting for reinstall\n"
|
||||||
|
rm -rf "$installDir/esp-dev-kits"
|
||||||
|
returnStatus
|
||||||
|
else
|
||||||
|
writeToLog "$installDir/esp-dev-kits not found, skipping delete for reinstall\n"
|
||||||
|
fi
|
||||||
|
|
||||||
istartTime=$(date '+%s')
|
istartTime=$(date '+%s')
|
||||||
writeToLog "CLONING esp-idf, branch $gitBranch with $gitJobs jobs to $idfDir\n\tCommand: $gitCloneCmd"
|
writeToLog "CLONING esp-idf, branch $gitBranch with $gitJobs jobs to $idfDir\n\tCommand: $gitCloneCmd"
|
||||||
|
|
||||||
eval "$gitCloneCmd"
|
eval "$gitCloneCmd"
|
||||||
returnStatus
|
returnStatus
|
||||||
gitChk=$?
|
gitChk=$?
|
||||||
|
|
||||||
|
writeToLog "CLONING esp-dev-kits\n\tCommand: '$gitDevKits'"
|
||||||
|
eval "$gitDevKits"
|
||||||
|
returnStatus
|
||||||
|
gitChk=$?
|
||||||
|
|
||||||
iendTime=$(date '+%s')
|
iendTime=$(date '+%s')
|
||||||
installerTime=$(($iendTime-$istartTime))
|
installerTime=$(($iendTime-$istartTime))
|
||||||
writeToLog "Git CLONE completed in $installerTime seconds from branch $gitBranch\n"
|
writeToLog "Git CLONE completed in $installerTime seconds from branch $gitBranch\n"
|
||||||
else
|
else
|
||||||
|
istartTime=$(date '+%s')
|
||||||
writeToLog "Setting for update mode\n"
|
writeToLog "Setting for update mode\n"
|
||||||
|
|
||||||
istartTime=$(date '+%s')
|
|
||||||
writeToLog "UPDATING esp-idf, branch $gitBranch with $gitJobs jobs to $idfDir\n\tCommand: $gitUpdateCmd"
|
writeToLog "UPDATING esp-idf, branch $gitBranch with $gitJobs jobs to $idfDir\n\tCommand: $gitUpdateCmd"
|
||||||
eval "$gitUpdateCmd"
|
eval "$gitUpdateCmd"
|
||||||
returnStatus
|
returnStatus
|
||||||
gitChk=$?
|
gitChk=$?
|
||||||
|
|
||||||
|
writeToLog "UPDATING esp-dev-kits\n\tCommand: '$gitDevKitsUpdate'"
|
||||||
|
eval "$gitDevKitsUpdate"
|
||||||
|
returnStatus
|
||||||
|
gitChk=$?
|
||||||
|
|
||||||
iendTime=$(date '+%s')
|
iendTime=$(date '+%s')
|
||||||
installerTime=$(($iendTime-$istartTime))
|
installerTime=$(($iendTime-$istartTime))
|
||||||
writeToLog "Git UPDATE completed in $installerTime seconds from Branch $gitBranch\n"
|
writeToLog "Git UPDATE completed in $installerTime seconds from Branch $gitBranch\n"
|
||||||
@@ -628,9 +653,9 @@ elif [[ "$arg" == "nuke" || "$arg" == "n" ]]; then
|
|||||||
|
|
||||||
exit
|
exit
|
||||||
|
|
||||||
elif [[ "$arg" == "nukereboot" || "$arg" == "nr" ]]; then
|
elif [[ "$arg" == "nukereboot" || "$arg" == "nr" || "$arg" == "rebootnuke" || "$arg" == "rn" ]]; then
|
||||||
action="REINSTALL (NUKEREBOOT)"
|
action="REINSTALL (NUKEREBOOT)"
|
||||||
sleepMins=0 # restart right away
|
sleepMins=1
|
||||||
idfGet="download"
|
idfGet="download"
|
||||||
|
|
||||||
handleStart
|
handleStart
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
1.0-release-r2
|
1.1-dev-1
|
||||||
Reference in New Issue
Block a user