Changeset 7254 in genesis

Timestamp:

Nov 16, 2009, 10:14:39 PM (15 years ago)

Author:

rick

Message:

before-commit.sh now checks for double ips as well

Location:

nodes

Files:

• before-commit.sh (modified) (2 diffs)
• dubbelipcheck.sh (modified) (3 diffs)

nodes/before-commit.sh

@@ -7 +7 @@
 RETVAL=0
 for FILE in ${DIRNAME}/*/wleiden.conf; do 
-  perl -c $FILE 
+  perl -c $FILE
   if [ $? -ne 0 ]; then
     RETVAL=1
@@ -14 +14 @@
 done
 
+if [ $RETVAL -eq 0 ]; then
+    sh dubbelipcheck.sh
+    if [ $? -ne 0 ]; then
+        RETVAL=1
+    fi
+fi
+
 if [ "${RETVAL}" -eq 1 ]; then
   echo "Please fix errors before commit!"

nodes/dubbelipcheck.sh

@@ -9 +9 @@
 allowed_dubbel_ip="172.31.255.1 172.31.255.2"
 tmp_files="all_ips all_ips_no_double"
+
+ERRNO=0
 
 #zoek alle ip address in de files op
@@ -42 +44 @@
         if [ "$dubbel_ips" ]; then
                 for dubbel_ip in $dubbel_ips ; do
+                        ERRNO=1
                         echo ""
                         echo "Dubbel ip gevonden: $dubbel_ip"
@@ -79 +82 @@
 
 main
-exit 0
+exit $ERRNO