diff --git a/README.md b/README.md index 646ea11..0d2bb28 100644 --- a/README.md +++ b/README.md @@ -76,9 +76,9 @@ cron: crontab -e 0 8 * * * bash $HOME/esp/esp-install-custom/reinstall-esp-idf.sh cron -manually wipe logs: - rm $ESPIDF_INSTALLDIR/install.log; rm $ESPIDF_INSTALLDIR/version-data.txt; touch $ESPIDF_INSTALLDIR/install.log; touch $ESPIDF_INSTALLDIR/version-data.txt; - monitor log file during install: - tail -n 75 $ESPIDF_INSTALLDIR/install.log; + tail -n 75 -f $ESPIDF_INSTALLDIR/install.log; + +view both logs from beginning: + less $ESPIDF_INSTALLDIR/install.log; less $ESPIDF_INSTALLDIR/version-data.txt; ``` \ No newline at end of file diff --git a/help.txt b/help.txt index b1bcffc..d45b0d8 100644 --- a/help.txt +++ b/help.txt @@ -65,8 +65,8 @@ Helpful Stuff: `crontab -e` 0 8 * * * bash $HOME/esp/esp-install-custom/reinstall-esp-idf.sh cron - manually wipe logs: - `rm $ESPIDF_INSTALLDIR/install.log; rm $ESPIDF_INSTALLDIR/version-data.txt; touch $ESPIDF_INSTALLDIR/install.log; touch $ESPIDF_INSTALLDIR/version-data.txt;` - monitor log file during install: - `tail -n 75 $ESPIDF_INSTALLDIR/install.log;` \ No newline at end of file + `tail -n 75 $ESPIDF_INSTALLDIR/install.log;` + + view both logs from beginning: + `less $ESPIDF_INSTALLDIR/install.log; less $ESPIDF_INSTALLDIR/version-data.txt` \ No newline at end of file diff --git a/reinstall-esp-idf.sh b/reinstall-esp-idf.sh index bbabede..80b9014 100644 --- a/reinstall-esp-idf.sh +++ b/reinstall-esp-idf.sh @@ -230,8 +230,10 @@ function handleStart() { installdirEnvvar=$ESPIDF_INSTALLDIR fi - writeToLog "\n === $(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): new ${action} ===" - writeToLog "\tVersion: ${scriptVers}\n" + if [ "$arg" != "interactive" -a "$arg" != "i" ]; then + writeToLog "\n === $(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): new ${action} ===" + writeToLog "\tVersion: ${scriptVers}\n" + fi writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')\nvars:\n\tuser: $USER\n\tscriptVers: $scriptVers\n\tversionData: $versionData\n\tlog: $log\n\tsleepMins: $sleepMins\n\tinstallDir: $installDir\n\tgitJobs: $gitJobs\n\tgitBranch: $gitBranch\n\tgitCmd: $gitCmd\n\trunningDir: $runningDir\n\tidfDir: $idfDir\n\tespressifLocation: $espressifLocation\n\tcustomBinLocation: $customBinLocation\n\tcustomBinFrom: $customBinFrom\n\tinstallCmd: $installCmd\n\ttoolsInstallCmd: $toolsInstallCmd\n\trcFile: $rcFile\n\t(envvar) ESPIDF_INSTALLDIR: $installdirEnvvar" @@ -324,6 +326,9 @@ elif [ "$arg" == "interactive" -o "$arg" == "i" ]; then gitJobs=$readGitJobs fi + writeToLog "\n === $(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): new ${action} ===" + writeToLog "\tVersion: ${scriptVers}\n" + writeToLog "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): Interactive vars set:\n\tinstallDir: $installDir\n\tgitBranch: $gitBranch\n\trcFile: $rcFile\n\tgitJobs: $gitJobs" handleStart @@ -339,6 +344,9 @@ elif [ "$arg" == "interactive" -o "$arg" == "i" ]; then elif [ "$arg" == "cron" -o "$arg" == "c" ]; then # full install with warn, sleep, and reboot action="REINSTALL (CRON)" + sleepMins=1 + # sleepMins=3 + handleStart handleLogoutAllUsers handleSetupEnvironment diff --git a/version.txt b/version.txt index 78e9fcf..f6afb7d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -60-beta2.4 \ No newline at end of file +60-rc0 \ No newline at end of file