fix(user/gpgfp-noemail):Rename and fix bk-gpgfp-noemail

[BK-2020-03.git] / unitproc / bktemp-checkAppFileDir

diff --git a/unitproc/bktemp-checkAppFileDir b/unitproc/bktemp-checkAppFileDir
index d5a620bbf09e422397002c2e1801b9fa8305f114..d2f58d285a4c872414690c73adce04f0f57f54fb 100644 (file)
--- a/unitproc/bktemp-checkAppFileDir
+++ b/unitproc/bktemp-checkAppFileDir
@@ -65,16 +65,18 @@ checkfile() {
 checkdir() {
     # Desc: If arg is a dir path, save result in assoc array 'dirRollCall'
     # Usage: checkdir arg1 arg2 arg3 ...
 checkdir() {
     # Desc: If arg is a dir path, save result in assoc array 'dirRollCall'
     # Usage: checkdir arg1 arg2 arg3 ...

-    # Version 0.1.1
+    # Version 0.1.2

     # Input: global assoc. array 'dirRollCall'
     # Output: adds/updates key(value) to global assoc array 'dirRollCall';
     # Input: global assoc. array 'dirRollCall'
     # Output: adds/updates key(value) to global assoc array 'dirRollCall';

-    # Output: returns 0 if app found, 1 otherwise
+    # Output: returns 0 if all args are dirs; 1 otherwise

     # Depends: Bash 5.0.3
     local returnState
 
     #===Process Args===
     for arg in "$@"; do
     # Depends: Bash 5.0.3
     local returnState
 
     #===Process Args===
     for arg in "$@"; do

-       if [ -d "$arg" ]; then
+       if [ -z "$arg" ]; then
+           dirRollCall["(Unspecified Dirname(s))"]="false"; returnState="false";
+       elif [ -d "$arg" ]; then

            dirRollCall["$arg"]="true";
            if ! [ "$returnState" = "false" ]; then returnState="true"; fi
        else
            dirRollCall["$arg"]="true";
            if ! [ "$returnState" = "false" ]; then returnState="true"; fi
        else


@@ -92,13 +94,14 @@ checkdir() {
 displayMissing() {
     # Desc: Displays missing apps, files, and dirs
     # Usage: displayMissing
 displayMissing() {
     # Desc: Displays missing apps, files, and dirs
     # Usage: displayMissing

-    # Version 0.1.1
+    # Version 1.0.0

     # Input: associative arrays: appRollCall, fileRollCall, dirRollCall
     # Output: stderr: messages indicating missing apps, file, or dirs
     # Input: associative arrays: appRollCall, fileRollCall, dirRollCall
     # Output: stderr: messages indicating missing apps, file, or dirs

+    # Output: returns exit code 0 if nothing missing; 1 otherwise

     # Depends: bash 5, checkAppFileDir()
     local missingApps value appMissing missingFiles fileMissing
     local missingDirs dirMissing
     # Depends: bash 5, checkAppFileDir()
     local missingApps value appMissing missingFiles fileMissing
     local missingDirs dirMissing

-    
+

     #==BEGIN Display errors==
     #===BEGIN Display Missing Apps===
     missingApps="Missing apps  :";
     #==BEGIN Display errors==
     #===BEGIN Display Missing Apps===
     missingApps="Missing apps  :";


@@ -152,6 +155,13 @@ displayMissing() {
     #===END Display Missing Directories===
 
     #==END Display errors==
     #===END Display Missing Directories===
 
     #==END Display errors==

+    #==BEGIN Determine function return code===
+    if [ "$appMissing" == "true" ] || [ "$fileMissing" == "true" ] || [ "$dirMissing" == "true" ]; then
+       return 1;
+    else
+       return 0;
+    fi
+    #==END Determine function return code===

 } # Display missing apps, files, dirs
 
 #===END Declare local script functions===
 } # Display missing apps, files, dirs
 
 #===END Declare local script functions===


@@ -160,9 +170,16 @@ displayMissing() {
 #==BEGIN sample code==
 if checkapp cat; then echo "cat found."; fi;
 if checkapp gpg; then echo "gpg found."; fi;
 #==BEGIN sample code==
 if checkapp cat; then echo "cat found."; fi;
 if checkapp gpg; then echo "gpg found."; fi;

+if displayMissing 1>/dev/null 2>&1; then
+    echo "Nothing missing so far...";
+fi;
+

 if checkapp emaaaacs; then echo "emaaaacs found."; fi;
 sleep 1;
 if checkapp emaaaacs; then echo "emaaaacs found."; fi;
 sleep 1;

-displayMissing;
+if ! displayMissing 1>/dev/null 2>&1; then
+    echo "Something is missing!";
+    displayMissing;
+fi;

 #==END sample code==
 
 # Author: Steven Baltaktei Sandoval
 #==END sample code==
 
 # Author: Steven Baltaktei Sandoval