Index: scripts/globals.sh =================================================================== diff -u -rd2dd5b16ad2c7e55a3a477f9597b1c6f5ca7a302 -rb313ce3c5b5ccb3372e1e5714efd8990da17bfd0 --- scripts/globals.sh (.../globals.sh) (revision d2dd5b16ad2c7e55a3a477f9597b1c6f5ca7a302) +++ scripts/globals.sh (.../globals.sh) (revision b313ce3c5b5ccb3372e1e5714efd8990da17bfd0) @@ -45,9 +45,9 @@ LOG_BASE=$SDCARD_MNT LOG_LOC_LOG=log LOG_LOC_ERR=service -EXT_GZIP=gz -EXT_PEND=u -EXT_UPLOAD=c +EXT_GZIP=gz # This has to match with application Logger.cpp +EXT_PEND=u # This has to match with application Logger.cpp +EXT_COMP=c # This has to match with application Logger.cpp ERR_MISSING_FOLDER=101 ERR_MISSING_FILE=102 @@ -666,7 +666,7 @@ # Uncomment the below for debugging # post_log "$LOG_PATH" - for logname in $(find -type f ! -name "*.$EXT_PEND.*" ! -name "*.$EXT_UPLOAD.*" ! -name "*$DATE*"); do + for logname in $(find -type f ! -name "*.$EXT_PEND*.*" ! -name "*.$EXT_COMP*.*" ! -name "*$DATE*"); do name=$(basename $logname) base="${name%%.*}" ext="${name##*.}" @@ -677,11 +677,12 @@ # backup_log "echo name: $base" # backup_log "echo ext : $ext" # backup_log "echo exts: $exts" + tally=$(log_tally "$base") if [[ "$ext" == "$EXT_GZIP" ]]; then - mv "$name" "$base.c.$exts" + mv "$name" "$base.$EXT_PEND$tally.$exts" else gzip "$name" - mv "$name.$EXT_GZIP" "$base.$EXT_PEND.$exts.$EXT_GZIP" + mv "$name.$EXT_GZIP" "$base.$EXT_PEND$tally.$exts.$EXT_GZIP" fi done cd @@ -692,6 +693,13 @@ rm $BACKUPLOG } +function log_tally() { + base="$1" + last_tally=$(find . -maxdepth 1 -type f -name "$base.$EXT_PEND*" | grep -oE "\.$EXT_PEND[0-9]+\.*" | grep -oE '[0-9]+' | sort -n | tail -1) + new_tally=$(( $last_tally + 1 )) + echo $new_tally +} + function log_backup_logApp() { backup_log_dash " Application " log_backup $LOG_LOC_LOG