Author: Gonéri Le Bouder <goneri at rulezlan.org>

Gonéri Le Bouder goneri at rulezlan.org
Mon Mar 2 12:33:26 CET 2009


    follow symlinks

diff --git a/gforge/setup b/gforge/setup
index def8f85..9a626ba 100755
--- a/gforge/setup
+++ b/gforge/setup
@@ -280,7 +280,7 @@ setupinout(){
 	#rm -f $ETCDIR/httpd.d/20list
 	#
 
-	find $ETCTEMPLATEDIR/httpd.d  -type f -regex "$ETCTEMPLATEDIR/httpd.d/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.ssl\|.secrets\)" $EXCLUDEVHOST | sort | while read i
+	find $ETCTEMPLATEDIR/httpd.d -L -type f -regex "$ETCTEMPLATEDIR/httpd.d/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.ssl\|.secrets\)" $EXCLUDEVHOST | sort | while read i
 	do
 		if [ "$ETCTEMPLATEDIR" != "$ETCDIR" -a -f $ETCDIR/httpd.d/`basename $i` ]
 		then
@@ -315,7 +315,7 @@ setupinout(){
 	rm $ETCDIR/httpd.secrets.gforge-new
 	
 	echo "Creating $LOCALINC"
-	find $ETCTEMPLATEDIR/local.d -type f -regex "$ETCTEMPLATEDIR/local.d/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.$database\)" | sort | while read i 
+	find $ETCTEMPLATEDIR/local.d -L -type f -regex "$ETCTEMPLATEDIR/local.d/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.$database\)" | sort | while read i 
 	do
 		if [ "$ETCTEMPLATEDIR" != "$ETCDIR" -a -f $ETCDIR/local.d/`basename $i` ]
 		then
@@ -328,12 +328,12 @@ setupinout(){
 		fi
 		$BINDIR/fill-in-the-blanks.pl $i $CONFFILEOUTDIR/`basename $i` $CONFFILEOUT
 	done
-	(find $CONFFILEOUTDIR  -type f -regex "$CONFFILEOUTDIR/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.$database\)" | sort | xargs cat ) > $LOCALINC
-	find $CONFFILEOUTDIR  -type f -regex "$CONFFILEOUTDIR/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.$database\)" -print0 | xargs -0 rm 
+	(find $CONFFILEOUTDIR  -L -type f -regex "$CONFFILEOUTDIR/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.$database\)" | sort | xargs cat ) > $LOCALINC
+	find $CONFFILEOUTDIR -L -type f -regex "$CONFFILEOUTDIR/\([a-z0-9]+\|_?([a-z0-9_.]+-)+[a-z0-9]+\|[a-z0-9][a-z0-9-]*\)\(\|.$database\)" -print0 | xargs -0 rm 
 
 	echo "Creating other includes"
 	#for i in $ETCDIR/templates/[a-z]*
-	find $ETCTEMPLATEDIR/templates -type f -regex "$ETCTEMPLATEDIR/templates/[a-z].*"  | while read i 
+	find $ETCTEMPLATEDIR/templates -L -type f -regex "$ETCTEMPLATEDIR/templates/[a-z].*"  | while read i 
 	do
 		if [ "$ETCTEMPLATEDIR" != "$ETCDIR" -a -f $ETCDIR/templates/`basename $i` ]
 		then




More information about the Fusionforge-general mailing list