From f02f963ed5890a794d2a4462eddd796b6a6d4a82 Mon Sep 17 00:00:00 2001 From: hPrnicessPi3 Date: Wed, 30 Apr 2025 11:35:40 -0600 Subject: [PATCH] exit_idf added. added echo of ESP_IDF_VERSION to export --- README.md | 4 ++-- add-to-export-sh.txt | 10 ++++++---- custom_bin/exit_idf | 16 ++++++++++++++++ help.txt | 11 +++++++++-- reinstall-esp-idf.sh | 5 +++-- version.txt | 2 +- 6 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 custom_bin/exit_idf diff --git a/README.md b/README.md index fa261a8..6ed7538 100644 --- a/README.md +++ b/README.md @@ -103,12 +103,12 @@ run_esp_reinstall Second optional argument specifies branch: `run_esp_reinstall nuke v5.4.1` -esp_monitor +esp_install_monitor monitors install.log alias for tail -n 75 -f $ESPIDF_INSTALLDIR/install.log no arguments -esp_logs +esp__install_logs displays full text of install.log and version-data.txt no arguments ``` diff --git a/add-to-export-sh.txt b/add-to-export-sh.txt index 59908a3..f786a38 100644 --- a/add-to-export-sh.txt +++ b/add-to-export-sh.txt @@ -13,7 +13,7 @@ installDate=installDateTAG if [ -z $ESPIDF_INSTALLDIR ]; then echo -e "\nFAIL: ESPIDF_INSTALLDIR environment variable not found!\nReinstall via script or manually add to ~/.zshrc\n" - # exit + exit fi binDir="$ESPIDF_INSTALLDIR/.custom_bin" @@ -60,10 +60,12 @@ alias monitor="idf.py monitor" alias flashmonitor="idf.py flash monitor" alias menuconfig="idf.py menuconfig" -# echo -e "Changing dir to $ESPIDF_INSTALLDIR" -# cd $ESPIDF_INSTALLDIR +echo -e "Changing dir to $ESPIDF_INSTALLDIR" +cd $ESPIDF_INSTALLDIR -echo -e "\nAll done :3\n" +echo -e "esp-idf $ESP_IDF_VERSION" + +echo -e "\nWelcome to esp-idf!\nAll done :3\n" ############################################### # end esp-idf stuffss I made ################## diff --git a/custom_bin/exit_idf b/custom_bin/exit_idf new file mode 100644 index 0000000..907bd57 --- /dev/null +++ b/custom_bin/exit_idf @@ -0,0 +1,16 @@ +unset $ESPIDF_INSTALLDIR +unset $IDF_PATH +unset $ESP_IDF_VERSION +unset $IDF_PYTHON_ENV_PATH +unset $OPENOCD_SCRIPTS +unset $ESP_ROM_ELF_DIR +unset $IDF_DEACTIVATE_FILE_PATH +unset $IDF_TOOLS_INSTALL_CMD +unset $IDF_TOOLS_EXPORT_CMD +unset $IDF_TOOLS_EXPORT_CMD +unset $ESPPORT +unset $ESPBAUD +unset $ESPTARGET +exec "$SHELL" --login +source $HOME/.zshrc +reset \ No newline at end of file diff --git a/help.txt b/help.txt index 373df6b..4b410a3 100644 --- a/help.txt +++ b/help.txt @@ -51,10 +51,16 @@ Usage: Once installed for the first time, restart your shell. to activate esp-idf with the custom additions, run: `get_idf` + exit with + `exit_idf` + for help + `help-esp` Features: `help-esp` show this help + `get_idf` enter esp-idf + `exit_idf` exit esp-idf and reset terminal `build` idf.py build `changebaud` prompts to enter a new baud `changeesp` prompts to type in esp32s3, esp32c6, etc @@ -72,6 +78,7 @@ Features: `chipinfo` get information from the esp chip `espinfo` get detailed information from the esp chip `menuconfig` run `idf.py menuconfig` + Aliases: run_esp_reinstall @@ -88,12 +95,12 @@ Aliases: Second optional argument specifies branch (requires two arguments!): `run_esp_reinstall nuke v5.4.1` - esp_monitor + esp_install_monitor monitors install.log alias for tail -n 75 -f $ESPIDF_INSTALLDIR/install.log no arguments - esp_logs + esp_install_logs displays full text of install.log and version-data.txt no arguments diff --git a/reinstall-esp-idf.sh b/reinstall-esp-idf.sh index bb86a3b..1fb2891 100644 --- a/reinstall-esp-idf.sh +++ b/reinstall-esp-idf.sh @@ -295,7 +295,7 @@ function handleDownloadInstall() { gitChk=$? iendTime=$(date '+%s') installerTime=$(($iendTime-$istartTime)) - writeToLog "Git CLONE completed in $installerTime seconds\n" + writeToLog "Git CLONE completed in $installerTime seconds from branch $gitBranch\n" else writeToLog "Setting for update mode\n" @@ -306,7 +306,7 @@ function handleDownloadInstall() { gitChk=$? iendTime=$(date '+%s') installerTime=$(($iendTime-$istartTime)) - writeToLog "Git UPDATE completed in $installerTime seconds\n" + writeToLog "Git UPDATE completed in $installerTime seconds from Branch $gitBranch\n" fi istartTime=$(date '+%s') @@ -587,6 +587,7 @@ elif [[ "$arg" == "interactive" || "$arg" == "i" ]]; then elif [[ "$arg" == "cron" || "$arg" == "c" ]]; then # full install with warn, sleep, and reboot action="REINSTALL (CRON)" # sleepMins=3 + idfGet="update" sleepMins=0 handleStart diff --git a/version.txt b/version.txt index cffdcd4..34af4ce 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -8-alpha +8-beta-2