fix(bklog):Add 2nd try to checkMakeTar() if tar --list fails

[EVA-2020-02.git] / exec / bklog

diff --git a/exec/bklog b/exec/bklog
index 67134e05b74ef2eb5d0be4835c1f6529cf403844..fbe28e0e651eac8dde57d76e84935fd3ddd4c86e 100644 (file)
--- a/exec/bklog
+++ b/exec/bklog
@@ -11,7 +11,7 @@ dirTmpDefault="/dev/shm"; # Default parent of working directory
 
 # Script Metadata
 scriptName="bklog";             # Define basename of script file.
-scriptVersion="0.1.23";          # Define version of script.
+scriptVersion="0.1.24";          # Define version of script.
 scriptURL="https://gitlab.com/baltakatei/ninfacyzga-01"; # Define wesite hosting this script.
 scriptTimeStart="$(date +%Y%m%dT%H%M%S.%N)"; # YYYYmmddTHHMMSS.NNNNNNNNN
 scriptHostname=$(hostname);     # Save hostname of system running this script.
@@ -66,7 +66,7 @@ processArguments() {
 vbm() {
     # Description: Prints verbose message ("vbm") to stderr if optionVerbose is set to "true".
     # Usage: vbm "DEBUG :verbose message here"
-    # Version 0.1.2
+    # Version 0.1.3
     # Input: arg1: string
     #        vars: optionVerbose
     # Output: stderr
@@ -74,7 +74,7 @@ vbm() {
 
     if [ "$optionVerbose" = "true" ]; then
        functionTime=$(date --iso-8601=ns); # Save current time in nano seconds.
-       echo "[$functionTime] ""$*" 1>&2; # Display argument text.
+       echo "[$functionTime]:$0:""$*" 1>&2; # Display argument text.
     fi
 
     # End function
@@ -357,17 +357,20 @@ checkMakeTar() {
     if tar --list --file="$pathTar" 1>/dev/null 2>&1; then
        ## T1: return success
        returnFlag0="tar valid";
+    elif { sleep 2; tar --list --file="$pathTar" 1>/dev/null 2>&1; }; then
+       ## F1: Check tar archive again after 2-second sleep
+       returnFlag0="tar valid";
     else
-       ## F1: Check if file exists
+       ## F2-1: Check if file exists
        if [[ -f "$pathTar" ]]; then
            ### T: Rename file
-           try mv "$pathTar" "$pathTar""--broken--""$(date +%Y%m%dT%H%M%S)" && \
+           try mv "$pathTar" "$pathTar""--broken--""$(date +%Y%m%dT%H%M%S%z)" && \
                returnFlag1="tar moved";
        else
            ### F: -
            :
        fi;
-       ## F2: Create tar archive, return 0
+       ## F2-1: Create tar archive, return 0
        try tar --create --file="$pathTar" --files-from=/dev/null && \
            returnFlag2="tar created";
     fi;