Date: Tue, 1 Aug 2006 13:41:07 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 102926 for review Message-ID: <200608011341.k71Df731092254@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=102926 Change 102926 by gabor@gabor_spitfire on 2006/08/01 13:41:03 Eliminate some more :S substitutions. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#14 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#14 (text+ko) ==== @@ -2,7 +2,8 @@ cd ${_DISTDIR} for _S in ${MASTER_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@}"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -18,7 +19,8 @@ fi done for _S in ${MASTER_SITE_SUBDIR}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -38,7 +40,8 @@ fi done for _S in ${MASTER_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" "s/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then @@ -127,7 +130,8 @@ _MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT} _G_TEMP= DEFAULT for _D in ${DISTFILES}; do - _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} + __TMP= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//" + _D_TEMP= `${ECHO_CMD} ${_D} | ${SED} "s/^${__TMP}//" 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 @@ -167,7 +171,8 @@ # # for use in the fetch targets for _S in ${MASTER_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@" + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} "s/^${__TMP}//" if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" -e "s/,/ /g"`; do SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites--${_group} @@ -245,7 +250,8 @@ if [ -z "${PATCHFILES}" ] ; then for _S in ${PATCH_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" ; then \ for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -261,7 +267,8 @@ fi done for _S in ${PATCH_SITE_SUBDIR}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} @@ -281,7 +288,8 @@ fi done for _S in ${PATCH_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "s/^://"` if [ -n "${_S_TEMP}" } ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do if [ -z "$${_PATCH_SITE_SUBDIR_${_group}}" ] ; then @@ -331,7 +339,8 @@ _PATCH_SITES_ALL= ${_PATCH_SITES_DEFAULT} _G_TEMP= DEFAULT for _P in ${PATCHFILES}; do - _P_TEMP= ${_P:S/^${_P:C/:[^:]+$//}//} + __TMP= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"` + _P_TEMP= `${ECHO_CMD} ${_P} | ${SED} "s/^${__TMP}//" 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 @@ -348,7 +357,8 @@ fi done for _S in ${PATCH_SITES}; do - _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//} + __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@"` + _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} "s/^${__TMP}//"` if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} -e "s/^://" "s/,/ /g"`; do SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-${_group}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608011341.k71Df731092254>