Merge branch 'trunk' into develop

include/cif++/condition.hpp

@@ -859,4 +859,4 @@ namespace literals
 	}
 	}
 } // namespace literals
 } // namespace literals
 
 
-} // namespace cif
+} // namespace cif
\ No newline at end of file

tools/update-libcifpp-data.in

@@ -2,7 +2,10 @@
 
 
 set -e
 set -e
 
 
-if [ "$EUID" -ne 0 ]
+# Get the effective UID, but do so in a compatible way (we may be running dash)
+euid=${EUID:-$(id -u)}
+
+if [ "${euid}" -ne 0 ] ; then
 	then echo "Please run as root"
 	then echo "Please run as root"
 	exit
 	exit
 fi
 fi