From 786a6e22b0ed71547b737de5a4002a8737fee9c6 Mon Sep 17 00:00:00 2001 From: hPrnicessPi3 Date: Sat, 10 May 2025 01:12:01 -0600 Subject: [PATCH] testiung for release 45 --- README.md | 2 +- esp-idf-tools-cmd.sh | 16 ++++++++++----- todo.txt | 48 ++++++++++++++++++++++---------------------- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 4591752..42e0ffe 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Literally the most schizophrenically overengineered thing I have ever made. idk ## Quick start 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` 4. `get-esp-tools` diff --git a/esp-idf-tools-cmd.sh b/esp-idf-tools-cmd.sh index b1284bb..2cbd1bf 100644 --- a/esp-idf-tools-cmd.sh +++ b/esp-idf-tools-cmd.sh @@ -27,6 +27,7 @@ if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" || "$1" == "h" ]]; then cat "$helpText" exit +fi defShell=$(awk -F: -v user="$USER" '$1 == user {print $NF}' /etc/passwd) @@ -123,7 +124,7 @@ function returnStatus() { ret=$? strii="\tReturn status: $ret" echo -e "$strii\n" - echo -e "$strii\n" >> $log + echo -e "$strii\n" >> "$log" return $ret } @@ -160,7 +161,7 @@ function handleSleep() { } 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) for package in "${packages[@]}"; do @@ -205,10 +206,14 @@ function handleCustomBins() { customBinExecChk=$? writeToLog "Copying vertson.txt and help.txt from $runningDir to $customBinLocation" - cp "$runningDir/help.txt $customBinLocation" + cp "$runningDir/help.txt" "$customBinLocation" returnStatus + helpExecChk=$? + cp "$runningDir/version.txt" "$customBinLocation" returnStatus + versuibExecChk=$? + } function handleExport() { @@ -510,7 +515,7 @@ elif [[ "$arg" == "retool" || "$arg" == "rt" ]]; then # just reinstall bins and exit -elif [[ "$arg" == "interactive" || "$arg" == "i" ]]; then +elif [[ "$arg" == "interactive" || "$arg" == "install" || "$arg" == "i" ]]; then action="REINSTALL (INTERACTIVE)" 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" read readgitJobs - echo "Enter mode: update or download, deafult: update" + echo "Enter mode: update or download, deafult: download" read readIdfGet 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" handleStart + handleCheckInstallPackages handleSetupEnvironment handleCustomBins handleDownloadInstall diff --git a/todo.txt b/todo.txt index 186b63e..9a062b7 100644 --- a/todo.txt +++ b/todo.txt @@ -1,27 +1,27 @@ -x export -x changeport -x erase-flash -x setup -x espinfo -x changetarget -x changebaud -x clean -x fullclean -x help-esp-tools -x run-esp-cmd [help h -h --help] - -x flashmonitor -x monitor -x step-flash-monitor -x menuconfig -x imagesize -x create-project -x rebuildfull -x chipinfo -x esp-install-monitor -x esp-install-logs -x run-esp-cmd n -x fresh install from nothing +export +changeport +erase-flash +setup +espinfo +changetarget +changebaud +clean +fullclean +help-esp-tools +run-esp-cmd [help h -h --help] +flashmonitor +monitor +step-flash-monitor +menuconfig +imagesize +create-project +rebuildfull +chipinfo +esp-install-monitor +esp-install-logs +run-esp-cmd n +fresh install from nothing +run-esp-cmd interactive audit readme maybe pretty up