Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Aug 2006 13:16:33 GMT
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 102920 for review
Message-ID:  <200608011316.k71DGXPp086582@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=102920

Change 102920 by gabor@gabor_spitfire on 2006/08/01 13:16:04

	Shellify make :M substitutions

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#13 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#13 (text+ko) ====

@@ -44,13 +44,13 @@
 			if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then
 				MASTER_SITES_TMP=	`${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"`
 			else
-				_S_TEMP_TEMP=	$${_MASTER_SITES_${_group}:M*%SUBDIR%/*}
+				_S_TEMP_TEMP=	`${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 				if [ -z "${_S_TEMP_TEMP}" ] ; then
 					MASTER_SITES_TMP=	$${_MASTER_SITES_${_group}}
 				else
 					MASTER_SITES_TMP=
 					for site in $${_MASTER_SITES_${_group}}; do
-						_S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
+						_S_TEMP_TEMP=	`${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 						if [ -z "${_S_TEMP_TEMP}" ] ; then
 							MASTER_SITES_TMP+=	${site}
 						else
@@ -66,13 +66,13 @@
 	fi
 done
 if [ -n "${_MASTER_SITE_SUBDIR_DEFAULT}" ] ; then
-	_S_TEMP=	${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*}
+	_S_TEMP=	`${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 	if [ -z "${_S_TEMP}" ] ; then
 		MASTER_SITES_TMP=	${_MASTER_SITES_DEFAULT}
 	else
 		MASTER_SITES_TMP=
 		for site in ${_MASTER_SITES_DEFAULT}; do
-			_S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
+			_S_TEMP_TEMP=	`${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 			if [ -z "${_S_TEMP_TEMP}" ] ; then
 				MASTER_SITES_TMP+=	${site}
 			else
@@ -131,7 +131,7 @@
 	if [ -n "${_D_TEMP}" ] ; then
 		for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do
 			if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then
-				_G_TEMP_TEMP=	${_G_TEMP:M/${_group}/}
+				_G_TEMP_TEMP=	`${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/`
 				if [ -z "${_G_TEMP_TEMP}" ; then
 					_G_TEMP+=	${_group}
 					_MASTER_SITES_ALL+=	$${_MASTER_SITES_${_group}}
@@ -285,13 +285,13 @@
 		if [ -n "${_S_TEMP}" } ; then
 			for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do
 				if [ -z "$${_PATCH_SITE_SUBDIR_${_group}}" ] ; then
-					_S_TEMP_TEMP=	${_PATCH_SITES_${_group}:M*%SUBDIR%/*}
+					_S_TEMP_TEMP=	`${ECHO_CMD} ${_PATCH_SITES_${_group}} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 					if [ -z "${_S_TEMP_TEMP}" ] ; then
 						PATCH_SITES_TMP=	${_PATCH_SITES_${_group}}
 					else
 						PATCH_SITES_TMP=
 						for site in $${_PATCH_SITES_${_group}}; do
-							_S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
+							_S_TEMP_TEMP=	`${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 							if [ -z "${_S_TEMP_TEMP}" ] ; then
 								PATCH_SITES_TMP+=	${site}
 							else
@@ -307,13 +307,13 @@
 		fi
 	done
 	if [ -n "${_PATCH_SITE_SUBDIR_DEFAULT}" ] ; then
-		_S_TEMP=	${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*}
+		_S_TEMP=	`${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 		if [ -z "${_S_TEMP}" ] ; then
 			PATCH_SITES_TMP=	${_PATCH_SITES_DEFAULT}
 		else
 			PATCH_SITES_TMP=
 			for site in ${_PATCH_SITES_DEFAULT}; do
-				_S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
+				_S_TEMP_TEMP=	`${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
 				if [ -z "${_S_TEMP_TEMP}" ] ; then
 					PATCH_SITES_TMP+=	${site}
 				else
@@ -335,7 +335,7 @@
 		if [ -n "${_P_TEMP}" ] ; then
 			for _group in `${ECHO_CMD} ${_P_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do
 				if [ -z "$${_PATCH_SITES_${_group}}" ] ; then
-					_G_TEMP_TEMP=	${_G_TEMP:M/${_group}/}
+					_G_TEMP_TEMP=	`${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/`
 					if [ -z "${_G_TEMP_TEMP}" ] ; then
 						_G_TEMP+=	${_group}
 						_PATCH_SITES_ALL+=	$${_PATCH_SITES_${_group}}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608011316.k71DGXPp086582>