verifier.sh: Make it work

conf.sh

@@ -42,8 +42,8 @@ AZB_EMAIL="jeezusjr@gmail.com"
 # Repository path and name
 AZB_REPO_BASEPATH="/data/pacman/repo"
 
-# SSH login address
-AZB_REMOTE_LOGIN="jalvarez@web200.webfaction.com"
+# SSH login address (can use ssh config Hosts)
+AZB_REMOTE_LOGIN="webfaction"
 
 # The signing key to use to sign packages
 AZB_GPG_SIGN_KEY='0EE7A126'

verifier.sh

@@ -2,8 +2,6 @@
 
 DIR="$( cd "$( dirname "$0"  )" && pwd  )"
 
-set -e
-
 source $DIR/lib.sh
 source $DIR/conf.sh
 
@@ -39,40 +37,45 @@ compute_local_repo_hash() {
     # $1: The repository to compute
     # Sets LOCAL_REPO_HASH
     msg2 "Computing local $1 repository hashes..."
-    LFILES=$(cd $AZB_REPO_BASEPATH; sha256sum $1/*/*)
+    LFILES=$(cd $AZB_REPO_BASEPATH; sha256sum $1/*/* | sort -r)
     debug "Repository hash list:"
     debug "$LFILES"
     LOCAL_REPO_HASH=$(echo "$LFILES" | sha256sum | cut -f 1 -d' ')
-    msg2 "Computed hash: $LOCAL_REPO_HASH"
+    msg2 "Local hash: $LOCAL_REPO_HASH"
 }
 
 compute_remote_repo_hash() {
     # $1: The repository to compute
     # Sets REMOTE_REPO_HASH
     msg2 "Computing remote $1 repository hashes..."
-    RFILES=$(ssh $AZB_REMOTE_LOGIN "cd webapps/default; sha256sum $1/*/*")
+    RFILES=$(ssh $AZB_REMOTE_LOGIN "cd webapps/default; sha256sum $1/*/* | sort -r")
     debug "Repository hash list:"
     debug "$RFILES"
     REMOTE_REPO_HASH=$(echo "$RFILES" | sha256sum | cut -f 1 -d' ')
-    msg2 "Computed hash: $REMOTE_REPO_HASH"
+    msg2 "Remote hash: $REMOTE_REPO_HASH"
 }
 
-compare_repo() {
-    # $1: The repo name to compare
-    compute_local_repo_hash $1
-    compute_remote_repo_hash $1
-    if [[ $REMOTE_REPO_HASH != $LOCAL_REPO_HASH ]]; then
-        return 1
-    fi
-    return 0
-}
+# Bail if no internet
+if [[ $(ping -w 1 -c 1 8.8.8.8 &> /dev/null; echo $?) != 0 ]]; then
+    exit 0;
+fi
 
+msg "verifier.sh started..."
+
+HAS_ERROR=0
 for REPO in 'demz-repo-archiso' 'demz-repo-core'; do
     msg "Checking ${REPO}..."
-    compare_repo $REPO
-    if [[ $? != 0 ]]; then
-        error "The database is out of sync, sending notification..."
-        send_email "$REPO is out of sync!" "$REPO is not in sync!"
+    # compare_repo $REPO
+    compute_local_repo_hash $REPO
+    compute_remote_repo_hash $REPO
+    if [[ $LOCAL_REPO_HASH != $REMOTE_REPO_HASH ]]; then
+        error "The $REPO is out of sync!"
+        HAS_ERROR=1
+        continue
     fi
     msg2 "$REPO is in sync"
 done
+
+if [[ $HAS_ERROR -eq 1 ]]; then
+    exit 1;
+fi