prerelease version 1.0-3

This commit is contained in:
2025-05-10 07:05:48 -06:00
parent 8e7d5e0f6f
commit f702114e7d
3 changed files with 15 additions and 8 deletions
+3
View File
@@ -30,3 +30,6 @@
1.0-release 1.0-release
stable release, identical to 1.0-prerelease-3 stable release, identical to 1.0-prerelease-3
1.0-release-r1
fixed cron bug
+10 -6
View File
@@ -20,7 +20,6 @@ startTime=$(date '+%s') # to time the (re)install time for the logs
# exit # exit
# always run globals and boilerplate # always run globals and boilerplate
# check for help first # check for help first
if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" || "$1" == "h" ]]; then if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" || "$1" == "h" ]]; then
helpText=$ESPIDFTOOLS_INSTALLDIR/.custom_bin/help.txt helpText=$ESPIDFTOOLS_INSTALLDIR/.custom_bin/help.txt
@@ -29,7 +28,7 @@ if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" || "$1" == "h" ]]; then
exit exit
fi fi
defShell=$(awk -F: -v user="$USER" '$1 == user {print $NF}' /etc/passwd) defShell=$(awk -F: -v user="$(whoami)" '$1 == user {print $NF}' /etc/passwd)
if [[ "$defShell" =~ zsh$ ]]; then if [[ "$defShell" =~ zsh$ ]]; then
echo -e "\nSelected zsh shell automatically\n" echo -e "\nSelected zsh shell automatically\n"
@@ -37,13 +36,17 @@ if [[ "$defShell" =~ zsh$ ]]; then
elif [[ "$defShell" =~ bash$ ]]; then elif [[ "$defShell" =~ bash$ ]]; then
echo -e "\nSelected bash shell automatically\n" echo -e "\nSelected bash shell automatically\n"
rcFile="$HOME/.bashrc" rcFile="$HOME/.bashrc"
elif [[ "$defShell" =~ sh$ ]]; then
rcFile="" # no need for rcFile var when run as cron
else else
echo "unsupported shell $defShell" echo "unsupported shell $defShell"
exit exit
fi fi
rcFile="$HOME/.zshrc" # absolute path only
# get us our FUCKING ALIASES HOLY FUCK GOD DAMN SHIT FUCK IT\ # 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 source "$rcFile" 2>/dev/null # >2?/dev/null is to redirect any errors
defaultInstallDir="$HOME/esp" defaultInstallDir="$HOME/esp"
if [ -z "$2" ]; then if [ -z "$2" ]; then
@@ -564,10 +567,10 @@ elif [[ "$arg" == "interactive" || "$arg" == "install" || "$arg" == "i" ]]; then
handleStart handleStart
handleCheckInstallPackages handleCheckInstallPackages
handleSetupEnvironment handleSetupEnvironment
handleAliasEnviron
handleCustomBins handleCustomBins
handleDownloadInstall handleDownloadInstall
handleExport handleExport
handleAliasEnviron
handleEnd handleEnd
exit exit
@@ -597,6 +600,7 @@ elif [[ "$arg" == "update" || "$arg" == "u" ]]; then # update without logouts or
handleStart handleStart
handleClearInstallLog handleClearInstallLog
handleSetupEnvironment handleSetupEnvironment
handleAliasEnviron
handleCustomBins handleCustomBins
handleDownloadInstall handleDownloadInstall
handleExport handleExport
@@ -616,10 +620,10 @@ elif [[ "$arg" == "nuke" || "$arg" == "n" ]]; then
handleStart handleStart
handleClearInstallLog handleClearInstallLog
handleSetupEnvironment handleSetupEnvironment
handleAliasEnviron
handleCustomBins handleCustomBins
handleDownloadInstall handleDownloadInstall
handleExport handleExport
handleAliasEnviron
handleEnd handleEnd
exit exit
@@ -633,10 +637,10 @@ elif [[ "$arg" == "nukereboot" || "$arg" == "nr" ]]; then
messagePTS "\n\nesp-idf-tools action $action started!\nWill reboot with $sleepMins minutes delay when complete!\n\n" messagePTS "\n\nesp-idf-tools action $action started!\nWill reboot with $sleepMins minutes delay when complete!\n\n"
handleClearInstallLog handleClearInstallLog
handleSetupEnvironment handleSetupEnvironment
handleAliasEnviron
handleCustomBins handleCustomBins
handleDownloadInstall handleDownloadInstall
handleExport handleExport
handleAliasEnviron
handleEnd handleEnd
handleReboot handleReboot
+1 -1
View File
@@ -1 +1 @@
1.0-release 1.0-release-r1