From e7eaf22b30cd9d7406c51a9d3022aaff787cee65 Mon Sep 17 00:00:00 2001
From: PrincessPi3 <human.bagel@gmail.com>
Date: Wed, 17 Dec 2025 05:32:12 -0700
Subject: [PATCH] 1.5-dev-0

---
 add-to-export-sh.txt | 2 +-
 esp-idf-tools-cmd.sh | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/add-to-export-sh.txt b/add-to-export-sh.txt
index c1aa9bf..59dd1ff 100644
--- a/add-to-export-sh.txt
+++ b/add-to-export-sh.txt
@@ -23,7 +23,7 @@ if [ -z "$ESPIDTOOLS_INSTALLDIR" ]; then
     echo -e "\nFAIL: ESPIDFTOOLS_INSTALLDIR environment variable not found!\nReinstall via script or manually add to ~/.bashrc\n"
 fi
 
-binDir="$ESPIDFTOOLS_INSTALLDIR/.custom_bin"
+binDir="$ESPDIR/.custom_bin"
 
 echo -e "\nChecking for Serial Devices in dmesg\n"
 COUNTER=0
diff --git a/esp-idf-tools-cmd.sh b/esp-idf-tools-cmd.sh
index ff7e436..477dafd 100644
--- a/esp-idf-tools-cmd.sh
+++ b/esp-idf-tools-cmd.sh
@@ -22,7 +22,7 @@ startTime=$(date '+%s') # to time the (re)install time for the logs
 # always run globals and boilerplate
 # check for help first
 if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" || "$1" == "h" ]]; then
-	helpText=$ESPIDFTOOLS_INSTALLDIR/.custom_bin/help.txt
+	helpText=$ESPDIR/.custom_bin/help.txt
 	cat "$helpText"
 
 	exit
@@ -46,10 +46,10 @@ fi
 rcFile="$HOME/.bashrc" # absolute path only
 # get us our FUCKING ALIASES HOLY FUCK GOD DAMN SHIT FUCK IT\
 source "$rcFile" 2>/dev/null # >2?/dev/null is to redirect any errors
-if [ -z $ESPIDFTOOLS_INSTALLDIR ]; then
+if [ -z "$ESPDIR" ]; then
 	installDir="$HOME/esp"
 else
-	installDir="$ESPIDFTOOLS_INSTALLDIR"
+	installDir="$ESPDIR"
 fi
 
 if [ -z "$2" ]; then
@@ -309,7 +309,8 @@ function handleAliasEnviron() {
 	cp $rcFile $rcFile.bak # backup da thing first frong
 	# the pretty comment and such first
 	testAppendAlias "# esp-idf-tools aliases" "\n\n# esp-idf-tools"
-	testAppendAlias "ESPIDFTOOLS_INSTALLDIR" "export ESPIDFTOOLS_INSTALLDIR=\"$installDir\""
+	testAppendAlias "ESPDIR" "export ESPIDFTOOLS_INSTALLDIR=\"$installDir\""
+	testAppendAlias "ESPIDFTOOLS_INSTALLDIR" "export ESPIDFTOOLS_INSTALLDIR=\"$installDir/esp-idf-tools\""
 	testAppendAlias "get-esp-tools" "alias get-esp-tools='. $exportScript'"
 	testAppendAlias "run-esp-cmd" "alias run-esp-cmd='bash $runningDir/esp-idf-tools-cmd.sh'"
 	testAppendAlias "esp-install-monitor" "alias esp-install-monitor='tail -n 75 -f $log'"