# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1461093753 -7200
# Node ID ec9fe77d9b9b6ef6c2b6f170d6c289f2c6e19c99
# Parent  0d8cf4785b666439013c135ab3d1c3995cd98981# Parent  35958ffd9f836627dd06d0708ddba1bc483bf3b0
Merged changes from the default branch.

diff -r 0d8cf4785b66 -r ec9fe77d9b9b tools/install.sh
--- a/tools/install.sh	Tue Apr 19 21:09:34 2016 +0200
+++ b/tools/install.sh	Tue Apr 19 21:22:33 2016 +0200
@@ -68,13 +68,17 @@
 fi
 
 if [ -e "$CONFIG_DIR/config.py" ]; then
-    mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py.new"
+    if ! cmp "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py" > /dev/null 2>&1 ; then
+        mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py.new"
+    fi
 else
     mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py"
 fi
 
 if [ -e "$CONFIG_DIR/config.sh" ]; then
-    cp "tools/config.sh" "$CONFIG_DIR/config.sh.new"
+    if ! cmp "tools/config.sh" "$CONFIG_DIR/config.sh" > /dev/null 2>&1 ; then
+        cp "tools/config.sh" "$CONFIG_DIR/config.sh.new"
+    fi
 else
     cp "tools/config.sh" "$CONFIG_DIR/config.sh"
 fi
@@ -90,7 +94,9 @@
 fi
 
 if [ -e "$CONFIG_DIR/postgresql/schema.sql" ]; then
-    cp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql.new"
+    if ! cmp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql" > /dev/null 2>&1 ; then
+        cp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql.new"
+    fi
 else
     cp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql"
 fi