feat(unitproc):checkMakeTar:Added more exit codes

exit code 0: tar readable
exit code 1: tar missing; created
exit code 2: tar not readable; moved; replaced

diff --git a/unitproc/bktemp-checkMakeTar b/unitproc/bktemp-checkMakeTar
index a1dc31208fddce40496b828ccb00c760761d9dd6..bde07d81b0509a43add5aadda346b9d471829017 100644 (file)
--- a/unitproc/bktemp-checkMakeTar
+++ b/unitproc/bktemp-checkMakeTar
@@ -11,34 +11,49 @@ try() { "$@" || die "cannot $*"; } #o
 checkMakeTar() {
     # Desc: Checks that a valid tar archive exists, creates one otherwise
     # Usage: checkMakeTar [ path ]
 checkMakeTar() {
     # Desc: Checks that a valid tar archive exists, creates one otherwise
     # Usage: checkMakeTar [ path ]

+    # Version: 1.0.0

     # Input: arg1: path of tar archive
     # Input: arg1: path of tar archive

-    # Output: exit code 0 (even if tar had to be created)
+    # Output: exit code 0 : tar readable
+    #         exit code 1 : tar missing; created
+    #         exit code 2 : tar not readable; moved; replaced

     # Depends: try, tar, date
     # Depends: try, tar, date

-    local PATH_TAR="$1"
+    local PATH_TAR returnFlag0 returnFlag1 returnFlag2
+    PATH_TAR="$1"

 
     # Check if file is a valid tar archive
     if tar --list --file="$PATH_TAR" 1>/dev/null 2>&1; then
        ## T1: return success
 
     # Check if file is a valid tar archive
     if tar --list --file="$PATH_TAR" 1>/dev/null 2>&1; then
        ## T1: return success

-       return 0;
+       returnFlag0="tar valid";

     else
        ## F1: Check if file exists
        if [[ -f "$PATH_TAR" ]]; then
            ### T: Rename file
     else
        ## F1: Check if file exists
        if [[ -f "$PATH_TAR" ]]; then
            ### T: Rename file

-           try mv "$PATH_TAR" "$PATH_TAR""--broken--""$(date +%Y%m%dT%H%M%S)";
+           try mv "$PATH_TAR" "$PATH_TAR""--broken--""$(date +%Y%m%dT%H%M%S)" && \
+               returnFlag1="tar moved";

        else
            ### F: -
            :
        fi
        ## F2: Create tar archive, return 0
        else
            ### F: -
            :
        fi
        ## F2: Create tar archive, return 0

-       try tar --create --file="$PATH_TAR" --files-from=/dev/null;
+       try tar --create --file="$PATH_TAR" --files-from=/dev/null && \
+           returnFlag2="tar created";
+    fi
+    
+    # Determine function return code
+    if [[ "$returnFlag0" = "tar valid" ]]; then

        return 0;
        return 0;

+    elif [[ "$returnFlag2" = "tar created" ]] && ! [[ "$returnFlag1" = "tar moved" ]]; then
+       return 1; # tar missing so created
+    elif [[ "$returnFlag2" = "tar created" ]] && [[ "$returnFlag1" = "tar moved" ]]; then
+       return 2; # tar not readable so moved; replaced

     fi
 } # checks if arg1 is tar; creates one otherwise
 #===END Declare local script functions===
 
 #====BEGIN sample code====
     fi
 } # checks if arg1 is tar; creates one otherwise
 #===END Declare local script functions===
 
 #====BEGIN sample code====

-myFile="/tmp/$(date +%s)..tar"
-yell "$myFile doesn't yet exist."
+#myFile="/tmp/$(date +%s)..tar"
+myFile="/tmp/$(date +%Y%m%d).tar"
+if [[ -f "$myFile" ]]; then yell "$myFile already exists."; else yell "$myFile doesn't yet exist."; fi

 if checkMakeTar "$myFile"; then
     yell "checkMakeTar() function run and exited:$?";
 else
 if checkMakeTar "$myFile"; then
     yell "checkMakeTar() function run and exited:$?";
 else