From owner-p4-projects@FreeBSD.ORG Tue Aug 1 13:41:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B7C516A4E0; Tue, 1 Aug 2006 13:41:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C7F716A4DA for ; Tue, 1 Aug 2006 13:41:13 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EFEB43D46 for ; Tue, 1 Aug 2006 13:41:13 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71Df7Wf092266 for ; Tue, 1 Aug 2006 13:41:07 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71Df731092254 for perforce@freebsd.org; Tue, 1 Aug 2006 13:41:07 GMT (envelope-from gabor@FreeBSD.org) Date: Tue, 1 Aug 2006 13:41:07 GMT Message-Id: <200608011341.k71Df731092254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 102926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 13:41:13 -0000 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}