m0ar fizax

esp-idf-tools-cmd.sh

@@ -55,18 +55,6 @@ else
 	gitBranch="$2"
 fi
 
-if [ -z "$ESPIDFTOOLS_INSTALLDIR" ]; then
-	# cant seem to get this one to use writeToLog
-	echo -e "ESPIDFTOOLS_INSTALLDIR environment variable not found, appending to $rcFile\n"
-	echo "export ESPIDFTOOLS_INSTALLDIR=\"$defaultInstallDir\"" >> "$rcFile"
-	installDir="$defaultInstallDir"
-	aliasInstallDirChk=$?
-else
-	echo -e "ESPIDFTOOLS_INSTALLDIR environment variable found, skipping\n"
-	installDir="$ESPIDFTOOLS_INSTALLDIR"
-	aliasInstallDirChk=0
-fi
-
 gitJobs=5 # number of jobs to download from github with
 rebootMins=3 # minutes of warning before reboot
 log="$installDir/install.log" # log file
@@ -318,6 +306,7 @@ function testAppendAlias() {
 function handleAliasEnviron() {
 	# the pretty comment and such first
 	testAppendAlias "# esp-idf-tools aliases" "\n# esp-idf-tools\n"
+	testAppendAlias "ESPIDFTOOLS_INSTALLDIR" "export ESPIDFTOOLS_INSTALLDIR=\"$defaultInstallDir\""
 	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'"

todo.txt

@@ -21,9 +21,9 @@ x test da shit proper in bash finafrickingly lmfao
     x recheck exit-esp-info
 README/help
     installer command
-        curl -s https://raw.githubusercontent.com/PrincessPi3/esp-idf-tools/refs/heads/master/install.sh | exec $SHELL
+        curl -s https://raw.githubusercontent.com/PrincessPi3/esp-idf-tools/refs/heads/master/install.sh | exec $SHELL; exec $SHELL
     uninstaller command
-        curl -s https://raw.githubusercontent.com/PrincessPi3/esp-idf-tools/refs/heads/master/uninstall.sh | exec $SHELL
+        curl -s https://raw.githubusercontent.com/PrincessPi3/esp-idf-tools/refs/heads/master/uninstall.sh | exec $SHELL; exec $SHELL
 uninstaller
     make uninstaller interactive by default to make sure of paths
     check envvars for info

uninstall.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+rcFile=~/.bashrc
+
 echo "STARTING UNINSTALLATION"
 
 # unset any esp-idf/-tools envvars
@@ -28,14 +30,14 @@ echo -e "\tRemoving log files"
 rm -f ~/esp/install.log 2>/dev/null
 rm -f ~/esp/version-data.log 2>/dev/null
 
-# cleanup ~/.bashrc
-## with first one, make a backup
-## after dat, no backups
-echo -e "\tCleaning up ~/.bashrc"
-sed -i.bak '/# esp-idf-tools/d' ~/.bashrc
-sed -i '/get-esp-tools/d' ~/.bashrc
-sed -i '/run-esp-cmd/d' ~/.bashrc
-sed -i '/esp-install-monitor/d' ~/.bashrc
-sed -i '/esp-install-logs/d' ~/.bashrc
+# cleanup $rcFile
+echo -e "\tCleaning up $rcFile"
+sed -i.bak '/# esp-idf-tools/d' $rcFile # with first one, maek a backup
+sed -i '/ESPIDFTOOLS_INSTALLDIR/d' $rcFile
+sed -i '/get-esp-tools/d' $rcFile
+sed -i '/run-esp-cmd/d' $rcFile
+sed -i '/esp-install-monitor/d' $rcFile
+sed -i '/esp-install-logs/d' $rcFile
+printf "%s" "$(cat $rcFile)" > $rcFile # remove leading and trailing newlines in place
 
 echo "DONE UNINSTALLING"