From owner-p4-projects@FreeBSD.ORG Fri Aug 11 20:00:27 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 A4F3616A51C; Fri, 11 Aug 2006 20:00:22 +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 6B7F916A51A for ; Fri, 11 Aug 2006 20:00:22 +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 0149743D46 for ; Fri, 11 Aug 2006 20:00:22 +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 k7BK0Lr6010960 for ; Fri, 11 Aug 2006 20:00:21 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7BK0Lr0010956 for perforce@freebsd.org; Fri, 11 Aug 2006 20:00:21 GMT (envelope-from gabor@FreeBSD.org) Date: Fri, 11 Aug 2006 20:00:21 GMT Message-Id: <200608112000.k7BK0Lr0010956@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 103659 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: Fri, 11 Aug 2006 20:00:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=103659 Change 103659 by gabor@gabor_spitfire on 2006/08/11 20:00:13 Fix some regexp in sed substitutions. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#19 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#19 (text+ko) ==== @@ -3,7 +3,7 @@ for _S in ${MASTER_SITES}; do __TMP= `${ECHO_CMD} ${_S} | ${SED} 's@/:[^/:]+$@/@'` - _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s|^${__TMP}||" -e '/^://'` + _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} @@ -12,11 +12,11 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's/@^(.*/):[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's/@^\(.*/\):[^/:]+$@\1@'` _MASTER_SITES_${_group}= $${_MASTER_SITES_${_group}} ${__SUFFIX_TMP} done else - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*/):[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^\(.*/\):[^/:]+$@\1@'` _MASTER_SITES_DEFAULT= ${_MASTER_SITES_DEFAULT} ${__SUFFIX_TMP} fi done @@ -32,13 +32,13 @@ exit 1 fi if [ -n "$${_MASTER_SITES_${_group}}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*)/:[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^\(.*\)/:[^/:]+$@\1@'` _MASTER_SITE_SUBDIR_${_group}= $${_MASTER_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi done else if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} '@^(.*)/:[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} '@^\(.*\)/:[^/:]+$@\1@'` _MASTER_SITE_SUBDIR_DEFAULT= ${_MASTER_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP} fi fi @@ -267,11 +267,11 @@ ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" exit 1 fi - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*/):[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^\(.*/\):[^/:]+$@\1@'` _PATCH_SITES_${_group}= $${_PATCH_SITES_${_group}} ${__SUFFIX_TMP} done else - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*/):[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^\(.*/\):[^/:]+$@\1@'` _PATCH_SITES_DEFAULT= ${_PATCH_SITES_DEFAULT} ${__SUFFIX_TMP} fi done @@ -287,13 +287,13 @@ exit 1 fi if [ -n "${_PATCH_SITES_${_group}}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*)/:[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^\(.*\)/:[^/:]+$@\1@'` _PATCH_SITE_SUBDIR_${_group}= $${_PATCH_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi done else if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then - __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^(.*)/:[^/:]+$@\1@'` + __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} 's@^\(.*\)/:[^/:]+$@\1@'` _PATCH_SITE_SUBDIR_DEFAULT= ${_PATCH_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP} fi fi