testiung for release 45
This commit is contained in:
@@ -10,7 +10,7 @@ Literally the most schizophrenically overengineered thing I have ever made. idk
|
|||||||
|
|
||||||
## Quick start
|
## Quick start
|
||||||
1. `git clone https://github.com/PrincessPi3/esp-idf-tools.git ~/esp-idf-tools`
|
1. `git clone https://github.com/PrincessPi3/esp-idf-tools.git ~/esp-idf-tools`
|
||||||
2. `bash ~/esp-idf-tools/esp-idf-tools-cmd.sh`
|
2. `bash ~/esp-idf-tools/esp-idf-tools-cmd.sh install`
|
||||||
3. `source ~/.zshrc`
|
3. `source ~/.zshrc`
|
||||||
4. `get-esp-tools`
|
4. `get-esp-tools`
|
||||||
|
|
||||||
|
|||||||
+11
-5
@@ -27,6 +27,7 @@ if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" || "$1" == "h" ]]; then
|
|||||||
cat "$helpText"
|
cat "$helpText"
|
||||||
|
|
||||||
exit
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
defShell=$(awk -F: -v user="$USER" '$1 == user {print $NF}' /etc/passwd)
|
defShell=$(awk -F: -v user="$USER" '$1 == user {print $NF}' /etc/passwd)
|
||||||
|
|
||||||
@@ -123,7 +124,7 @@ function returnStatus() {
|
|||||||
ret=$?
|
ret=$?
|
||||||
strii="\tReturn status: $ret"
|
strii="\tReturn status: $ret"
|
||||||
echo -e "$strii\n"
|
echo -e "$strii\n"
|
||||||
echo -e "$strii\n" >> $log
|
echo -e "$strii\n" >> "$log"
|
||||||
|
|
||||||
return $ret
|
return $ret
|
||||||
}
|
}
|
||||||
@@ -160,7 +161,7 @@ function handleSleep() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleCheckInstallPackages() {
|
function handleCheckInstallPackages() {
|
||||||
# writeToLog "Handling check and install packages (function ran)\n"
|
writeToLog "Handling check and install packages (function ran)"
|
||||||
packages=(git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0)
|
packages=(git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0)
|
||||||
|
|
||||||
for package in "${packages[@]}"; do
|
for package in "${packages[@]}"; do
|
||||||
@@ -205,10 +206,14 @@ function handleCustomBins() {
|
|||||||
customBinExecChk=$?
|
customBinExecChk=$?
|
||||||
|
|
||||||
writeToLog "Copying vertson.txt and help.txt from $runningDir to $customBinLocation"
|
writeToLog "Copying vertson.txt and help.txt from $runningDir to $customBinLocation"
|
||||||
cp "$runningDir/help.txt $customBinLocation"
|
cp "$runningDir/help.txt" "$customBinLocation"
|
||||||
returnStatus
|
returnStatus
|
||||||
|
helpExecChk=$?
|
||||||
|
|
||||||
cp "$runningDir/version.txt" "$customBinLocation"
|
cp "$runningDir/version.txt" "$customBinLocation"
|
||||||
returnStatus
|
returnStatus
|
||||||
|
versuibExecChk=$?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleExport() {
|
function handleExport() {
|
||||||
@@ -510,7 +515,7 @@ elif [[ "$arg" == "retool" || "$arg" == "rt" ]]; then # just reinstall bins and
|
|||||||
|
|
||||||
exit
|
exit
|
||||||
|
|
||||||
elif [[ "$arg" == "interactive" || "$arg" == "i" ]]; then
|
elif [[ "$arg" == "interactive" || "$arg" == "install" || "$arg" == "i" ]]; then
|
||||||
action="REINSTALL (INTERACTIVE)"
|
action="REINSTALL (INTERACTIVE)"
|
||||||
|
|
||||||
echo "Enter full path to install dir, default: $installDir"
|
echo "Enter full path to install dir, default: $installDir"
|
||||||
@@ -525,7 +530,7 @@ elif [[ "$arg" == "interactive" || "$arg" == "i" ]]; then
|
|||||||
echo "Enter numeber of jobs to download from github with, default: $gitJobs"
|
echo "Enter numeber of jobs to download from github with, default: $gitJobs"
|
||||||
read readgitJobs
|
read readgitJobs
|
||||||
|
|
||||||
echo "Enter mode: update or download, deafult: update"
|
echo "Enter mode: update or download, deafult: download"
|
||||||
read readIdfGet
|
read readIdfGet
|
||||||
|
|
||||||
if [ ! -z $readInstallDir ]; then
|
if [ ! -z $readInstallDir ]; then
|
||||||
@@ -554,6 +559,7 @@ elif [[ "$arg" == "interactive" || "$arg" == "i" ]]; then
|
|||||||
writeToLog "Interactive vars set:\n\tinstallDir: $installDir\n\tgitBranch: $gitBranch\n\trcFile: $rcFile\n\tgitJobs: $gitJobs\n\tidfGet: $idfGet\n"
|
writeToLog "Interactive vars set:\n\tinstallDir: $installDir\n\tgitBranch: $gitBranch\n\trcFile: $rcFile\n\tgitJobs: $gitJobs\n\tidfGet: $idfGet\n"
|
||||||
|
|
||||||
handleStart
|
handleStart
|
||||||
|
handleCheckInstallPackages
|
||||||
handleSetupEnvironment
|
handleSetupEnvironment
|
||||||
handleCustomBins
|
handleCustomBins
|
||||||
handleDownloadInstall
|
handleDownloadInstall
|
||||||
|
|||||||
@@ -1,27 +1,27 @@
|
|||||||
x export
|
export
|
||||||
x changeport
|
changeport
|
||||||
x erase-flash
|
erase-flash
|
||||||
x setup
|
setup
|
||||||
x espinfo
|
espinfo
|
||||||
x changetarget
|
changetarget
|
||||||
x changebaud
|
changebaud
|
||||||
x clean
|
clean
|
||||||
x fullclean
|
fullclean
|
||||||
x help-esp-tools
|
help-esp-tools
|
||||||
x run-esp-cmd [help h -h --help]
|
run-esp-cmd [help h -h --help]
|
||||||
|
flashmonitor
|
||||||
x flashmonitor
|
monitor
|
||||||
x monitor
|
step-flash-monitor
|
||||||
x step-flash-monitor
|
menuconfig
|
||||||
x menuconfig
|
imagesize
|
||||||
x imagesize
|
create-project
|
||||||
x create-project
|
rebuildfull
|
||||||
x rebuildfull
|
chipinfo
|
||||||
x chipinfo
|
esp-install-monitor
|
||||||
x esp-install-monitor
|
esp-install-logs
|
||||||
x esp-install-logs
|
run-esp-cmd n
|
||||||
x run-esp-cmd n
|
fresh install from nothing
|
||||||
x fresh install from nothing
|
run-esp-cmd interactive
|
||||||
|
|
||||||
audit readme
|
audit readme
|
||||||
maybe pretty up
|
maybe pretty up
|
||||||
|
|||||||
Reference in New Issue
Block a user