From dc553ec9c0a172c51a69ce2fe9599c1123d493ba Mon Sep 17 00:00:00 2001
From: Chris Ball <cjb@laptop.org>
Date: Mon, 5 Apr 2010 13:09:29 -0400
Subject: Make config parsing more robust

Previously, config booleans like etherpad.isProduction accepted only
"true", and not "true " or " true" or "True" or "TRUE".  Fix that.
---
 infrastructure/net.appjet.oui/config.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'infrastructure')

diff --git a/infrastructure/net.appjet.oui/config.scala b/infrastructure/net.appjet.oui/config.scala
index 46e73cf..6201816 100644
--- a/infrastructure/net.appjet.oui/config.scala
+++ b/infrastructure/net.appjet.oui/config.scala
@@ -41,7 +41,7 @@ object config {
       null;
     }
   }
-  def boolOrElse(name: String, default: Boolean) = values.get(name).map(_.equals("true")).getOrElse(default);
+  def boolOrElse(name: String, default: Boolean) = values.get(name).map(_.matches("(?i)\\s*true\\s*")).getOrElse(default);
   def intOrElse(name: String, default: Int) = values.get(name).map(Integer.parseInt(_)).getOrElse(default);
   def longOrElse(name: String, default: Long) = values.get(name).map(java.lang.Long.parseLong(_)).getOrElse(default);
 
-- 
cgit v1.2.3-1-g7c22


From ec9fcd7b971f2cab81050679f662c2a21ce87626 Mon Sep 17 00:00:00 2001
From: Jeppe Toustrup <jeppe@tenzer.dk>
Date: Tue, 5 Jan 2010 23:21:39 +0100
Subject: Made check to see if we are on Solaris, and if we are, then don't use
 '-u' on the cp command.

Also, convertion of spaces to tabs.
---
 infrastructure/bin/compilecache.sh | 84 +++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

(limited to 'infrastructure')

diff --git a/infrastructure/bin/compilecache.sh b/infrastructure/bin/compilecache.sh
index a2b6220..6e42a50 100644
--- a/infrastructure/bin/compilecache.sh
+++ b/infrastructure/bin/compilecache.sh
@@ -16,49 +16,51 @@
 
 CP_CMD="cp -R -u"
 if [ `uname` == "Darwin" ]; then
-    CP_CMD="/bin/cp -R -n"
+	CP_CMD="/bin/cp -R -n"
+elif [ `uname` == "SunOS" ]; then
+	CP_CMD="cp -R" #Solaris cp does not have '-u'
 fi
 
 function cacheonfiles {
-    NAME=$1; FILES=$2; FUNC=$3; NOCOPY=1;
-    if [ -z "$4" ]; then
-	NOCOPY=0
-    fi
-    REBUILD=0
-    BPATH=buildcache/$NAME
-    FILETEST=$BPATH/t
-    if [ ! -f $FILETEST ]; then
-	REBUILD=1
-    else
-	for a in $FILES; do
-	    if [ $FILETEST -ot $a ]; then
-		echo $a has changed, rebuilding $NAME
+	NAME=$1; FILES=$2; FUNC=$3; NOCOPY=1;
+	if [ -z "$4" ]; then
+		NOCOPY=0
+	fi
+	REBUILD=0
+	BPATH=buildcache/$NAME
+	FILETEST=$BPATH/t
+	if [ ! -f $FILETEST ]; then
 		REBUILD=1
-	    fi
-	done
-    fi
-    if [ $REBUILD -eq 1 ]; then
-	if [ -d $BPATH ]; then
-	    rm -rf $BPATH
+	else
+		for a in $FILES; do
+			if [ $FILETEST -ot $a ]; then
+				echo $a has changed, rebuilding $NAME
+				REBUILD=1
+			fi
+		done
+	fi
+	if [ $REBUILD -eq 1 ]; then
+		if [ -d $BPATH ]; then
+			rm -rf $BPATH
+		fi
+		mkdir -p $BPATH
+		$FUNC $BPATH
+		pushd $BPATH >> /dev/null
+		touch t
+		popd >> /dev/null
+	else
+		echo using cached $NAME...
+	fi
+	if [ $NOCOPY -ne 1 ]; then
+		for a in $BPATH/*; do
+			if [ -d $a ]; then
+				$CP_CMD $a build/
+			elif [ -f $a ]; then
+				cp $a build/
+			else
+				echo unknown file type $a
+				exit 1
+			fi
+		done
 	fi
-	mkdir -p $BPATH
-	$FUNC $BPATH
-	pushd $BPATH >> /dev/null
-	touch t
-	popd >> /dev/null
-    else 
-	echo using cached $NAME...
-    fi
-    if [ $NOCOPY -ne 1 ]; then
-	for a in $BPATH/*; do
-	    if [ -d $a ]; then
-		$CP_CMD $a build/
-	    elif [ -f $a ]; then
-		cp $a build/
-	    else
-		echo unknown file type $a
-		exit 1
-	    fi
-	done
-    fi
-}	   
+}
-- 
cgit v1.2.3-1-g7c22