From f15f72bd0f7838fdc75877ccb380f62874df25d1 Mon Sep 17 00:00:00 2001 From: PrincessPi3 Date: Wed, 17 Dec 2025 07:40:46 -0700 Subject: [PATCH] 1.5-dev-0 --- .gitignore | 0 .gitmodules | 0 CHANGELOG.txt | 0 README.md | 0 add-to-export-sh.txt | 0 custom_bin/build | 0 custom_bin/changebaud.sh | 0 custom_bin/changeesp.sh | 0 custom_bin/changeport.sh | 0 custom_bin/chipinfo | 0 custom_bin/clean | 0 custom_bin/create-project | 0 custom_bin/erase-flash | 0 custom_bin/espinfo | 0 custom_bin/exit-esp-tools.sh | 0 custom_bin/flash | 0 custom_bin/flashmonitor | 0 custom_bin/fullclean | 0 custom_bin/help-esp-tools | 2 +- custom_bin/imagesize | 0 custom_bin/menuconfig | 0 custom_bin/monitor | 0 custom_bin/patch-esp-idf | 6 +- custom_bin/rebuild-auto-flashmonitor | 0 custom_bin/rebuild-interactive | 0 custom_bin/save-defconfig | 0 custom_bin/setup | 0 custom_bin/size-stats | 0 custom_bin/step-flash-monitor | 0 esp-idf-tools-cmd.sh | 2 +- gather_install_size.sh | 0 help.txt | 0 install.sh | 0 scratch.txt | 150 +++++++++++++-------------- todo.txt | 0 uninstall.sh | 0 version.txt | 0 37 files changed, 80 insertions(+), 80 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .gitmodules mode change 100644 => 100755 CHANGELOG.txt mode change 100644 => 100755 README.md mode change 100644 => 100755 add-to-export-sh.txt mode change 100644 => 100755 custom_bin/build mode change 100644 => 100755 custom_bin/changebaud.sh mode change 100644 => 100755 custom_bin/changeesp.sh mode change 100644 => 100755 custom_bin/changeport.sh mode change 100644 => 100755 custom_bin/chipinfo mode change 100644 => 100755 custom_bin/clean mode change 100644 => 100755 custom_bin/create-project mode change 100644 => 100755 custom_bin/erase-flash mode change 100644 => 100755 custom_bin/espinfo mode change 100644 => 100755 custom_bin/exit-esp-tools.sh mode change 100644 => 100755 custom_bin/flash mode change 100644 => 100755 custom_bin/flashmonitor mode change 100644 => 100755 custom_bin/fullclean mode change 100644 => 100755 custom_bin/help-esp-tools mode change 100644 => 100755 custom_bin/imagesize mode change 100644 => 100755 custom_bin/menuconfig mode change 100644 => 100755 custom_bin/monitor mode change 100644 => 100755 custom_bin/patch-esp-idf mode change 100644 => 100755 custom_bin/rebuild-auto-flashmonitor mode change 100644 => 100755 custom_bin/rebuild-interactive mode change 100644 => 100755 custom_bin/save-defconfig mode change 100644 => 100755 custom_bin/setup mode change 100644 => 100755 custom_bin/size-stats mode change 100644 => 100755 custom_bin/step-flash-monitor mode change 100644 => 100755 esp-idf-tools-cmd.sh mode change 100644 => 100755 gather_install_size.sh mode change 100644 => 100755 help.txt mode change 100644 => 100755 install.sh mode change 100644 => 100755 scratch.txt mode change 100644 => 100755 todo.txt mode change 100644 => 100755 uninstall.sh mode change 100644 => 100755 version.txt diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 diff --git a/CHANGELOG.txt b/CHANGELOG.txt old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/add-to-export-sh.txt b/add-to-export-sh.txt old mode 100644 new mode 100755 diff --git a/custom_bin/build b/custom_bin/build old mode 100644 new mode 100755 diff --git a/custom_bin/changebaud.sh b/custom_bin/changebaud.sh old mode 100644 new mode 100755 diff --git a/custom_bin/changeesp.sh b/custom_bin/changeesp.sh old mode 100644 new mode 100755 diff --git a/custom_bin/changeport.sh b/custom_bin/changeport.sh old mode 100644 new mode 100755 diff --git a/custom_bin/chipinfo b/custom_bin/chipinfo old mode 100644 new mode 100755 diff --git a/custom_bin/clean b/custom_bin/clean old mode 100644 new mode 100755 diff --git a/custom_bin/create-project b/custom_bin/create-project old mode 100644 new mode 100755 diff --git a/custom_bin/erase-flash b/custom_bin/erase-flash old mode 100644 new mode 100755 diff --git a/custom_bin/espinfo b/custom_bin/espinfo old mode 100644 new mode 100755 diff --git a/custom_bin/exit-esp-tools.sh b/custom_bin/exit-esp-tools.sh old mode 100644 new mode 100755 diff --git a/custom_bin/flash b/custom_bin/flash old mode 100644 new mode 100755 diff --git a/custom_bin/flashmonitor b/custom_bin/flashmonitor old mode 100644 new mode 100755 diff --git a/custom_bin/fullclean b/custom_bin/fullclean old mode 100644 new mode 100755 diff --git a/custom_bin/help-esp-tools b/custom_bin/help-esp-tools old mode 100644 new mode 100755 index 6887c8b..e66cd12 --- a/custom_bin/help-esp-tools +++ b/custom_bin/help-esp-tools @@ -1,2 +1,2 @@ #!/bin/bash -cat $ESPIDFTOOLS_INSTALLDIR/.custom_bin/help.txt +cat $ESPDIR/.custom_bin/help.txt diff --git a/custom_bin/imagesize b/custom_bin/imagesize old mode 100644 new mode 100755 diff --git a/custom_bin/menuconfig b/custom_bin/menuconfig old mode 100644 new mode 100755 diff --git a/custom_bin/monitor b/custom_bin/monitor old mode 100644 new mode 100755 diff --git a/custom_bin/patch-esp-idf b/custom_bin/patch-esp-idf old mode 100644 new mode 100755 index 8964934..3cd2fec --- a/custom_bin/patch-esp-idf +++ b/custom_bin/patch-esp-idf @@ -1,6 +1,6 @@ #!/bin/bash set -e -echo -e "\napplyan a patch~ $1 to $ESPIDFTOOLS_INSTALLDIR/esp-idf\n" -cp "$1" "$ESPIDFTOOLS_INSTALLDIR/esp-idf" -git -C "$ESPIDFTOOLS_INSTALLDIR/esp-idf" apply "$1" +echo -e "\napplyan a patch~ $1 to $ESPDIR/esp-idf\n" +cp "$1" "$ESPDIR/esp-idf" +git -C "$ESPDIR/esp-idf" apply "$1" echo -e "\nall donseies~\n" \ No newline at end of file diff --git a/custom_bin/rebuild-auto-flashmonitor b/custom_bin/rebuild-auto-flashmonitor old mode 100644 new mode 100755 diff --git a/custom_bin/rebuild-interactive b/custom_bin/rebuild-interactive old mode 100644 new mode 100755 diff --git a/custom_bin/save-defconfig b/custom_bin/save-defconfig old mode 100644 new mode 100755 diff --git a/custom_bin/setup b/custom_bin/setup old mode 100644 new mode 100755 diff --git a/custom_bin/size-stats b/custom_bin/size-stats old mode 100644 new mode 100755 diff --git a/custom_bin/step-flash-monitor b/custom_bin/step-flash-monitor old mode 100644 new mode 100755 diff --git a/esp-idf-tools-cmd.sh b/esp-idf-tools-cmd.sh old mode 100644 new mode 100755 index 477dafd..df987f4 --- a/esp-idf-tools-cmd.sh +++ b/esp-idf-tools-cmd.sh @@ -309,7 +309,7 @@ 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 "ESPDIR" "export ESPIDFTOOLS_INSTALLDIR=\"$installDir\"" + testAppendAlias "ESPDIR" "export ESPDIR=\"$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'" diff --git a/gather_install_size.sh b/gather_install_size.sh old mode 100644 new mode 100755 diff --git a/help.txt b/help.txt old mode 100644 new mode 100755 diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 diff --git a/scratch.txt b/scratch.txt old mode 100644 new mode 100755 index 874909a..9754b05 --- a/scratch.txt +++ b/scratch.txt @@ -1,76 +1,76 @@ -nuke: - no --single-branch - Git clone completed in 566 seconds - Installer completed in 251 seconds - Extra tools installer completed in 138 seconds - reinstall completed in 957 seconds - with --single-branch - Git CLONE completed in 398 seconds # markedly faster - Installer completed in 277 seconds # slightly slower - Extra tools installer completed in 169 seconds # slighly slower - reinstall completed in 846 seconds # still a bit faster - -further study is required - - -exportCatChk -pkgInstallChk # doesnt always runnn -gitChk # is set by eithr clone or pull -installChk -toolsInstallChk # usually errors~ -exportSedReturnChk -exportSedVersionChk -exportSedDateChk -exportSedHashChk -aliasRunEspReinstallChk -aliasEspMonitorchk -aliasEspLogsChk -aliasInstallDirChk - -x warnChk // after loop of warning users -x logoutChk // after loop of logging out users -x gitLogChk // after apppending the git log to $versionData -x gitHashChk // on get git hash -x rmIdfDirChk // on delete esp-idf dir -x rmEspressifChk // on delete .espressif dir -x mkInstallDirChk // on create install dir -x restoreExportScriptChk // on restoring the export.sh.bak -x rmExportScriptCh // on deleting export script -x backupExportScriptChk // on backing up the new export.sh.bak -x customBinExecChk // on making custom scripts executable -x cpCustomBinChk // copying the new custom scripts -x rmCustomBinChk // on delete custom bins dir -sleepChk // on wake from sleep\ - -# default values for retcodes -exportCatChk=0 -pkgInstallChk=0 -gitChk=0 -installChk=0 -toolsInstallChk=0 -exportSedReturnChk=0 -exportSedVersionChk=0 -exportSedDateChk=0 -exportSedHashChk=0 -aliasRunEspReinstallChk=0 -aliasEspMonitorchk=0 -aliasEspLogsChk=0 -aliasInstallDirChk=0 -warnChk=0 -logoutChk=0 -gitLogChk=0 -gitHashChk=0 -rmIdfDirChk=0 -rmEspressifChk=0 -mkInstallDirChk=0 -restoreExportScriptChk=0 -rmExportScriptChk=0 -backupExportScriptChk=0 -customBinExecChk=0 -cpCustomBinChk=0 -rmCustomBinChk=0 -sleepChk=0 -rmExportBackupChk=0 - - +nuke: + no --single-branch + Git clone completed in 566 seconds + Installer completed in 251 seconds + Extra tools installer completed in 138 seconds + reinstall completed in 957 seconds + with --single-branch + Git CLONE completed in 398 seconds # markedly faster + Installer completed in 277 seconds # slightly slower + Extra tools installer completed in 169 seconds # slighly slower + reinstall completed in 846 seconds # still a bit faster + +further study is required + + +exportCatChk +pkgInstallChk # doesnt always runnn +gitChk # is set by eithr clone or pull +installChk +toolsInstallChk # usually errors~ +exportSedReturnChk +exportSedVersionChk +exportSedDateChk +exportSedHashChk +aliasRunEspReinstallChk +aliasEspMonitorchk +aliasEspLogsChk +aliasInstallDirChk + +x warnChk // after loop of warning users +x logoutChk // after loop of logging out users +x gitLogChk // after apppending the git log to $versionData +x gitHashChk // on get git hash +x rmIdfDirChk // on delete esp-idf dir +x rmEspressifChk // on delete .espressif dir +x mkInstallDirChk // on create install dir +x restoreExportScriptChk // on restoring the export.sh.bak +x rmExportScriptCh // on deleting export script +x backupExportScriptChk // on backing up the new export.sh.bak +x customBinExecChk // on making custom scripts executable +x cpCustomBinChk // copying the new custom scripts +x rmCustomBinChk // on delete custom bins dir +sleepChk // on wake from sleep\ + +# default values for retcodes +exportCatChk=0 +pkgInstallChk=0 +gitChk=0 +installChk=0 +toolsInstallChk=0 +exportSedReturnChk=0 +exportSedVersionChk=0 +exportSedDateChk=0 +exportSedHashChk=0 +aliasRunEspReinstallChk=0 +aliasEspMonitorchk=0 +aliasEspLogsChk=0 +aliasInstallDirChk=0 +warnChk=0 +logoutChk=0 +gitLogChk=0 +gitHashChk=0 +rmIdfDirChk=0 +rmEspressifChk=0 +mkInstallDirChk=0 +restoreExportScriptChk=0 +rmExportScriptChk=0 +backupExportScriptChk=0 +customBinExecChk=0 +cpCustomBinChk=0 +rmCustomBinChk=0 +sleepChk=0 +rmExportBackupChk=0 + + shutdown -k "message" // send out warning and disable logins, but do not shutdown \ No newline at end of file diff --git a/todo.txt b/todo.txt old mode 100644 new mode 100755 diff --git a/uninstall.sh b/uninstall.sh old mode 100644 new mode 100755 diff --git a/version.txt b/version.txt old mode 100644 new mode 100755