diff --git a/cron-reinstall-esp-idf.sh b/cron-reinstall-esp-idf.sh index a801304..47835f4 100644 --- a/cron-reinstall-esp-idf.sh +++ b/cron-reinstall-esp-idf.sh @@ -1,5 +1,5 @@ #!/bin/bash -cronVers=30-live # version of this script +cronVers=32-live # version of this script sleepSecs=180 # seconds of warning to wait for user to log out log=$HOME/esp/install.log @@ -23,12 +23,12 @@ function write_to_log() { startTime=$(date '+%s') -write_to_log " === $(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): new reinstall ===" +write_to_log " === $(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): new reinstall ===" write_to_log "Cron version: ${cronVers}" -warningString="WARNING:\n\tReinstalling esp-idf in ${sleepSecs} seconds! Save and log out!\n\tmonitor with \`tail -f -n 50 $HOME/esp/install.log\`\n\tterminate with \`sudo killall cron-reinstall-esp-idf.sh\`\n\t$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)')" +warningString="WARNING:\n\tReinstalling esp-idf in ${sleepSecs} seconds! Save and log out!\n\tmonitor with \`tail -f -n 50 $HOME/esp/install.log\`\n\tterminate with \`sudo killall cron-reinstall-esp-idf.sh\`\n\t$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')" -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): sending warning message to $myUser" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): sending warning message to $myUser" write_to_log "$warningString" echo -e "$warningString" | sudo write $myUser return_status @@ -46,92 +46,92 @@ espressifLocation=$HOME/.espressif customBinLocation=$installDir/.custom_bin customBinFrom=$runningDir/custom_bin -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)')\nvars:\n\tmyUser: $myUser\n\tcronVers: $cronVers\n\tgitJobs: $gitJobs\n\tlog: $log\n\tsleepSecs: $sleepSecs\n\tinstallDir: $installDir\n\tgitBranch: $gitBranch\n\trunningDir: $runningDir\n\tidfDir: $idfDir\n\tespressifLocation: $espressifLocation\n\tcustomBinLocation: $customBinLocation\n\tcustomBinFrom: $customBinFrom" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')\nvars:\n\tmyUser: $myUser\n\tcronVers: $cronVers\n\tgitJobs: $gitJobs\n\tlog: $log\n\tsleepSecs: $sleepSecs\n\tinstallDir: $installDir\n\tgitBranch: $gitBranch\n\trunningDir: $runningDir\n\tidfDir: $idfDir\n\tespressifLocation: $espressifLocation\n\tcustomBinLocation: $customBinLocation\n\tcustomBinFrom: $customBinFrom" return_status if ! [ -d $installDir ]; then - write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): creating ${installDir}" + write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): creating ${installDir}" mkdir $installDir return_status fi if [ -d $idfDir ]; then - write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): deleting ${idfDir}" + write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): deleting ${idfDir}" rm -rf $idfDir return_status fi if [ -d $espressifLocation ]; then - write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): deleting ${espressifLocation}" + write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): deleting ${espressifLocation}" rm -rf "${espressifLocation}" return_status fi if [ -d $customBinLocation ]; then - write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): deleting ${customBinLocation}" + write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): deleting ${customBinLocation}" rm -rf $customBinLocation return_status fi -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): copying scripts from ${customBinFrom} to ${customBinLocation}" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): copying scripts from ${customBinFrom} to ${customBinLocation}" cp -r $customBinFrom $customBinLocation return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): making scripts executable at ${customBinLocation}" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): making scripts executable at ${customBinLocation}" chmod -R +x $customBinLocation return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): cloning git branch ${gitBranch} with ${gitJobs} jobs to ${idfDir}" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): cloning git branch ${gitBranch} with ${gitJobs} jobs to ${idfDir}" git clone --recursive --jobs $gitJobs --branch $gitBranch https://github.com/espressif/esp-idf $idfDir return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): installing with ${idfDir}/install.sh all" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): installing with ${idfDir}/install.sh all" eval "${idfDir}/install.sh all" return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): installing tools with idf_tools.py" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): installing tools with idf_tools.py" python $idfDir/tools/idf_tools.py install all return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): backing up export.sh" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): backing up export.sh" cp $idfDir/export.sh $idfDir/export.sh.bak return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): editing export.sh" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): editing export.sh" sed -i 's/return 0/# return 0/g' $idfDir/export.sh return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): adding add-to-export-sh.txt to export.ss" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): adding add-to-export-sh.txt to export.ss" cat $runningDir/add-to-export-sh.txt >> $idfDir/export.sh return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): getting the commit hash" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): getting the commit hash" commitHash=$(git -C $idfDir rev-parse HEAD) return_status -gitDataLog="Installed at:\n\t$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)')\n\tat commit $commitHash\n\tfrom branch $gitBranch" +gitDataLog="Installed at:\n\t$(date '+%d/%m/%Y %H:%M:%S %Z (%s)')\n\tat commit $commitHash\n\tfrom branch $gitBranch" write_to_log $gitDataLog echo -e $gitDataLog >> $idfDir/version-data.txt return_status -rebootMsg="$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): rebooting in ${sleepSecs} seconds. seave and log out" +rebootMsg="$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): rebooting in ${sleepSecs} seconds. seave and log out" write_to_log $rebootMsg echo $rebootMsg | sudo write princesspi return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): sleeping ${sleepSecs} seconds" +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): sleeping ${sleepSecs} seconds" sleep $sleepSecs return_status -write_to_log "$(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): sending final message and rebooting"; +write_to_log "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): sending final message and rebooting"; echo "rebooting NOW bye bye" | sudo write $myUser return_status endTime=$(date '+%s') timeElapsed=(($endTime-$startTime)) -write_to_log "total install time $timeElapsed seconds" +write_to_log "reinstall completed in $timeElapsed seconds" -write_to_log " === $(date '+%d/%m/%Y-%H.%M.%S %Z (%s)'): finished ===\n" +write_to_log " === $(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): finished ===\n" sudo reboot