SPECS: builder - avoid problems in if []

arekm arekm at pld-linux.org
Sun Oct 16 15:37:37 CEST 2005


Author: arekm                        Date: Sun Oct 16 13:37:37 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid problems in if []

---- Files affected:
SPECS:
   builder (1.338 -> 1.339) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.338 SPECS/builder:1.339
--- SPECS/builder:1.338	Sat Oct 15 15:00:00 2005
+++ SPECS/builder	Sun Oct 16 15:37:31 2005
@@ -651,14 +651,14 @@
 					url=$(distfiles_url "$i")
 					url_attic=$(distfiles_attic_url "$i")
 					FROM_DISTFILES=1
-					if [ `echo $url | grep -E '^(\.|/)'` ]; then
+					if [ "`echo $url | grep -E '^(\.|/)'`" ]; then
 						${GETLOCAL} $url $target
 					else
 						if [ -z "$NOMIRRORS" ]; then
 							url="`find_mirror "$url"`"
 						fi
 						${GETURI} ${OUTFILEOPT} "$target" "$url" || \
-						if [ `echo $url | grep -E 'ftp://'` ]; then
+						if [ "`echo $url | grep -E 'ftp://'`" ]; then
 							${GETURI2} ${OUTFILEOPT} "$target" "$url"
 						fi
 					fi
@@ -671,7 +671,7 @@
 								url_attic="`find_mirror "$url_attic"`"
 							fi
 							${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
-							if [ `echo $url_attic | grep -E 'ftp://'` ]; then
+							if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
 								${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
 							fi
 						fi
@@ -702,14 +702,14 @@
 					done
 				fi
 
-				if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
+				if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ "`echo $i | grep -E 'ftp://|http://|https://'`" ]; then
 					if [ -z "$NOMIRRORS" ]; then
 						im="`find_mirror "$i"`"
 					else
 						im="$i"
 					fi
 					${GETURI} "$im" || \
-					if [ `echo $im | grep -E 'ftp://'` ]; then
+					if [ "`echo $im | grep -E 'ftp://'`" ]; then
 						${GETURI2} "$im"
 					fi
 				fi
@@ -742,13 +742,13 @@
 				FROM_DISTFILES=2
 				rm -f $target
 				${GETURI} ${OUTFILEOPT} "$target" "$url" || \
-				if [ `echo $url | grep -E 'ftp://'` ]; then
+				if [ "`echo $url | grep -E 'ftp://'`" ]; then
 					${GETURI2} ${OUTFILEOPT} "$target" "$url"
 				fi
 				if ! test -s "$target"; then
 					rm -f "$target"
 					${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
-					if [ `echo $url_attic | grep -E 'ftp://'` ]; then
+					if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
 						${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
 					fi
 				fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.338&r2=1.339&f=u




More information about the pld-cvs-commit mailing list