[Fusionforge-commits] r6960 - in trunk: . gforge gforge/debian gforge/www/include

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Feb 10 20:06:39 CET 2009


Author: lolando
Date: 2009-02-10 20:06:39 +0100 (Tue, 10 Feb 2009)
New Revision: 6960

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959


Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2009-02-10 19:05:05 UTC (rev 6959)
+++ trunk/gforge/debian/changelog	2009-02-10 19:06:39 UTC (rev 6960)
@@ -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/setup
===================================================================
--- trunk/gforge/setup	2009-02-10 19:05:05 UTC (rev 6959)
+++ trunk/gforge/setup	2009-02-10 19:06:39 UTC (rev 6960)
@@ -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 Fusionforge-commits mailing list