From 6cf5a0a843ecd1348fab8362fb5a32be131f32db Mon Sep 17 00:00:00 2001 From: hPrnicessPi3 Date: Fri, 9 May 2025 17:55:08 -0600 Subject: [PATCH] more fixes and polish, inching closer to release --- custom_bin/espinfo | 4 ++-- esp-idf-tools-cmd.sh | 20 ++++++++++---------- version.txt | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/custom_bin/espinfo b/custom_bin/espinfo index 10e8c2d..360072e 100644 --- a/custom_bin/espinfo +++ b/custom_bin/espinfo @@ -1,7 +1,7 @@ echo "esp-idf-tools install dir: $ESPIDF_INSTALLDIR" echo "esp-idf-tools custom_bin dir: $ESPIDF_INSTALLDIR/.custom_bin/" echo "esp-idf-tools version: $(cat $ESPIDF_INSTALLDIR/.custom_bin/version.txt)" -echo "esp-idf-tools last install: $(tail -1 $ESPIDF_INSTALLDIR/.custom_bin/version-data.log)" +echo "esp-idf-tools last install: $(tail -1 $ESPIDF_INSTALLDIR/version-data.log)" echo "esp-idf path: $IDF_PATH" echo "esp-idf version: $ESP_IDF_VERSION" echo "esp-idf python path: $IDF_PYTHON_ENV_PATH" @@ -9,7 +9,7 @@ echo "openocd scripts: $OPENOCD_SCRIPTS" echo "esp-idf rom elf dir: $ESP_ROM_ELF_DIR" echo "esp-idf-deactivate file path $IDF_DEACTIVATE_FILE_PATH" echo "esp-idf install cmd: $IDF_TOOLS_INSTALL_CMD" -echo "esp-idf export cmd: $IDF_TOOLS_EXPORT_CMD" +echo "esp-idf export cmd: $IDF_TOOLS_EXPORT_CMD"es echo "port: $ESPPORT" echo "baud: $ESPBAUD" echo "target device: $ESPTARGET" \ No newline at end of file diff --git a/esp-idf-tools-cmd.sh b/esp-idf-tools-cmd.sh index 085be62..d799f33 100644 --- a/esp-idf-tools-cmd.sh +++ b/esp-idf-tools-cmd.sh @@ -359,12 +359,12 @@ function handleDownloadInstall() { gitHashChk=$? # if gitDataLog file doesnt exist, initialize with header - if [[ ! -f "$gitDataLog" ]]; then - writeToLog "$gitDataLog not found, initializing with header" - echo "date | esp-idf branch | esp-idf-tools version | action" > "$gitDataLog"; + if [[ ! -f "$versionData" ]]; then + writeToLog "$versionData not found, initializing with header" + echo "date | esp-idf branch | esp-idf-tools version | action" > "$versionData"; fi - # date | esp-idf branch | esp-idf-tools version | action + # date ddmmYYYY H:M:S (unix seconds) | esp-idf branch | esp-idf-tools version | action gitDataLog="$(date '+%d/%m/%Y %H:%M:%S %Z (%s)') | $commitHash | $gitBranch | $scriptVers | $action" writeToLog "$gitDataLog" echo "$gitDataLog" >> $versionData @@ -418,13 +418,13 @@ function handleEmptyLogs() { rm -f $versionData echo -e "\tReturn status: ${?}\n" - echo "Creating empty file at $log" - touch $log - echo -e "\tReturn status: ${?}\n" + # echo "Creating empty file at $log" + # touch $log + # echo -e "\tReturn status: ${?}\n" - echo "Creating empty file at $versionData" - touch $versionData - echo -e "\tReturn status: ${?}\n" + # echo "Creating empty file at $versionData" + # touch $versionData + # echo -e "\tReturn status: ${?}\n" } function handleUninstall() { diff --git a/version.txt b/version.txt index d53f6a0..0abe9ef 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -9-rc-6 \ No newline at end of file +9-rc-7 \ No newline at end of file