Move checkOwner() to functions.sh

lib/functions.sh

@@ -7,6 +7,15 @@ exitIfNotRoot() {
   fi
 }
 
+checkOwner(){
+  COUNT=$(find $1 ! -user $2 |wc -l)
+  if [ $COUNT -gt 0 ]; then
+    log ERROR "$COUNT files in $1 are not owned by user $2. Run find $1 ! -user $2 to see them, chown -R $2 $1 to correct this issue."
+    return 1
+  fi
+  return 0
+}
+
 log() {
   echo -e "$(date +'%Y-%m-%d %T')" "$1:" "$2"
 }

lib/prerequisites.sh

@@ -2,22 +2,13 @@
 
 source lib/functions.sh
 
-checkOwner(){
-  ## Check for file permissions
-  COUNT=$(find $1 ! -user $2 |wc -l)
-  if [ $COUNT -gt 0 ]; then
-    log ERROR "$COUNT files in $1 are not owned by user $2. Run find $1 ! -user $2 to see them, chown -R $2 $1 to correct this issue."
-    exit 1
-  fi
-}
-
 if ! id "bridgehead" &>/dev/null; then
   log ERROR "User bridgehead does not exist. Please consult readme for installation."
   exit 1
 fi
 
-checkOwner . bridgehead
-checkOwner /etc/bridgehead bridgehead
+checkOwner . bridgehead || exit 1
+checkOwner /etc/bridgehead bridgehead || exit 1
 
 ## Check if user is a su
 log INFO "Checking if all prerequisites are met ..."