From: Steven Baltakatei Sandoval Date: Fri, 10 Jul 2020 03:55:19 +0000 (+0000) Subject: style(unitproc):checkMakeTar(): Change VAR_NAMES to varNames X-Git-Tag: 0.3.0~26 X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/commitdiff_plain/9c7ec3f76915a23c1b5fe6880f1bed349e4f0c01 style(unitproc):checkMakeTar(): Change VAR_NAMES to varNames --- diff --git a/unitproc/bktemp-checkMakeTar b/unitproc/bktemp-checkMakeTar index 288a000..07cec78 100644 --- a/unitproc/bktemp-checkMakeTar +++ b/unitproc/bktemp-checkMakeTar @@ -1,5 +1,4 @@ #!/bin/bash - # Desc: Checks that a valid tar archive exists, creates one otherwise #===BEGIN Declare local script functions=== @@ -9,33 +8,33 @@ try() { "$@" || die "cannot $*"; } #o checkMakeTar() { # Desc: Checks that a valid tar archive exists, creates one otherwise # Usage: checkMakeTar [ path ] - # Version: 1.0.1 + # Version: 1.0.2 # Input: arg1: path of tar archive # Output: exit code 0 : tar readable # exit code 1 : tar missing; created # exit code 2 : tar not readable; moved; replaced - # Depends: try, tar, date - local PATH_TAR returnFlag0 returnFlag1 returnFlag2 - PATH_TAR="$1" + # Depends: bash 5, date 8, tar 1, try() + local pathTar returnFlag0 returnFlag1 returnFlag2 + pathTar="$1"; # Check if file is a valid tar archive - if tar --list --file="$PATH_TAR" 1>/dev/null 2>&1; then + if tar --list --file="$pathTar" 1>/dev/null 2>&1; then ## T1: return success returnFlag0="tar valid"; else ## F1: Check if file exists - if [[ -f "$PATH_TAR" ]]; then + if [[ -f "$pathTar" ]]; then ### T: Rename file - try mv "$PATH_TAR" "$PATH_TAR""--broken--""$(date +%Y%m%dT%H%M%S)" && \ + try mv "$pathTar" "$pathTar""--broken--""$(date +%Y%m%dT%H%M%S)" && \ returnFlag1="tar moved"; else ### F: - : - fi + fi; ## F2: Create tar archive, return 0 - try tar --create --file="$PATH_TAR" --files-from=/dev/null && \ + try tar --create --file="$pathTar" --files-from=/dev/null && \ returnFlag2="tar created"; - fi + fi; # Determine function return code if [[ "$returnFlag0" = "tar valid" ]]; then @@ -44,7 +43,7 @@ checkMakeTar() { return 1; # tar missing so created elif [[ "$returnFlag2" = "tar created" ]] && [[ "$returnFlag1" = "tar moved" ]]; then return 2; # tar not readable so moved; replaced - fi + fi; } # checks if arg1 is tar; creates one otherwise #===END Declare local script functions===