[evolvis-commits] r12838: Merged from 4.7: Fixed bashisms in setup

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 02:02:54 CET 2011


Author: mirabilos
Date: 2011-02-28 02:02:54 +0100 (Mon, 28 Feb 2011)
New Revision: 12838

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge/install.sh
   trunk/gforge_base/evolvisforge-5.1/gforge/setup
   trunk/gforge_base/evolvisforge-5.1/gforge/www/include/squal_pre.php
Log:
Merged from 4.7: Fixed bashisms in setup

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 01:02:51 UTC (rev 12837)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 01:02:54 UTC (rev 12838)
@@ -4,6 +4,13 @@
 
  -- Roland Mas <lolando at debian.org>  Thu, 05 Feb 2009 22:14:45 +0100
 
+gforge (4.7.1-1+) experimental; urgency=low
+
+  * Fixed bashisms in /usr/lib/gforge/bin/setup, thanks to Gonéri Le
+    Bouder (Closes: #514768).
+
+ -- Roland Mas <lolando at debian.org>  Tue, 10 Feb 2009 19:57:41 +0100
+
 gforge (4.7.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/setup
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/setup	2011-02-28 01:02:51 UTC (rev 12837)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/setup	2011-02-28 01:02:54 UTC (rev 12838)
@@ -240,7 +240,7 @@
 		readdefault $CONFFILEIN.new
 	fi
 	
-	if [ "$interact" == true ]
+	if [ "$interact" = true ]
 	then
 		echo "Enter values or type enter for defaults:"
 		# Here is the fun II
@@ -265,7 +265,7 @@
 	
 	# Fill in the blanks
 	EXCLUDEVHOST=' -not -name 55vhost'
-	if [ "$dovhost" == true ]
+	if [ "$dovhost" = true ]
 	then
 		EXCLUDEVHOST='' 		
 	fi
@@ -294,12 +294,12 @@
 		$BINDIR/fill-in-the-blanks.pl $i $ETCDIR/`basename $i`.gforge-new $CONFFILEOUT
 	done
 	
-	if [ $listen80 == false ]
+	if [ $listen80 = false ]
 	then
 		rm -f $ETCDIR/00listen80.gforge-new
 	fi
 
-	if [ $usessl == false -o -z "$(findkey)" -o -z "$(findcrt)" ]
+	if [ $usessl = false -o -z "$(findkey)" -o -z "$(findcrt)" ]
 	then
 		echo "SSL Disabled"
 		rm -f $ETCDIR/[0-9][0-9]*.ssl.gforge-new



More information about the evolvis-commits mailing list