From owner-p4-projects@FreeBSD.ORG Wed Jul 26 19:11:04 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 E742416A4DF; Wed, 26 Jul 2006 19:11:03 +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 AA1DC16A4DA for ; Wed, 26 Jul 2006 19:11:03 +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 58A2A43D46 for ; Wed, 26 Jul 2006 19:11:03 +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 k6QJB3ao055347 for ; Wed, 26 Jul 2006 19:11:03 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6QJB2Ox055344 for perforce@freebsd.org; Wed, 26 Jul 2006 19:11:02 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 26 Jul 2006 19:11:02 GMT Message-Id: <200607261911.k6QJB2Ox055344@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 102485 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: Wed, 26 Jul 2006 19:11:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=102485 Change 102485 by gabor@gabor_spitfire on 2006/07/26 19:10:34 Syntactical fixes. I did not use the correct brackets everywhere. Affected files ... .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#8 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#8 (text+ko) ==== @@ -3,7 +3,7 @@ for _S in ${MASTER_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default @@ -19,7 +19,7 @@ done for _S in ${MASTER_SITE_SUBDIR}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then @@ -27,31 +27,31 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - if [ -n "$(_MASTER_SITES_${_group})" ] ; then + if [ -n "${_MASTER_SITES_${_group}}" ] ; then _MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi done else - if [ -n "$(_MASTER_SITES_DEFAULT)" ] ; then + if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then _MASTER_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi fi done for _S in ${MASTER_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do - if [ -z "$$(_MASTER_SITE_SUBDIR_${_group})" ] ; then + if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} else _S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + 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%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP+= ${site} else for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do @@ -65,15 +65,15 @@ done fi done -if [ -n "$(_MASTER_SITE_SUBDIR_DEFAULT)" ] ; then +if [ -n "${_MASTER_SITE_SUBDIR_DEFAULT}" ] ; then _S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP)" ] ; then + 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%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then MASTER_SITES_TMP+= ${site} else for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do @@ -96,7 +96,7 @@ # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository # for everything, but don't search it twice by appending it to the end. -if [ -n "$(MASTER_SITE_FREEBSD)" ] ; then +if [ -n "${MASTER_SITE_FREEBSD}" ] ; then _MASTER_SITE_OVERRIDE= ${MASTER_SITE_BACKUP} _MASTER_SITE_BACKUP= else @@ -128,11 +128,11 @@ _G_TEMP= DEFAULT for _D in ${DISTFILES}; do _D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//} - if [ -n "$(_D_TEMP)" ] ; then + 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 + if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} - if [ -z "$(_G_TEMP_TEMP)" ; then + if [ -z "${_G_TEMP_TEMP}" ; then _G_TEMP+= ${_group} _MASTER_SITES_ALL+= ${_MASTER_SITES_${_group}} fi @@ -209,10 +209,10 @@ ${ECHO_MSG} "=> ${DISTDIR} is not writable by you; cannot fetch." exit 1 fi - if [ ! -z "$select" ] ; then + if [ ! -z "${select}" ] ; then ___MASTER_SITES_TMP= for group in $select; do - if [ ! -z "$${_MASTER_SITES_${group}}" ] ; then + if [ ! -z "$${_MASTER_SITES_${group}n" ] ; then eval ___MASTER_SITES_TMP="$${_MASTER_SITES_${group}}" __MASTER_SITES_TMP="${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}" fi @@ -246,7 +246,7 @@ if [ -z "${PATCHFILES}" ] ; then for _S in ${PATCH_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "${_S_TEMP)" ; then \ + if [ -n "${_S_TEMP}" ; then \ for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then @@ -262,7 +262,7 @@ done for _S in ${PATCH_SITE_SUBDIR}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then @@ -270,29 +270,29 @@ ${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" exit 1 fi - if [ -n "$(_PATCH_SITES_${_group})" ] ; then + if [ -n "${_PATCH_SITES_${_group}}" ] ; then _PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi done else - if [ -n "$(_PATCH_SITES_DEFAULT)" ] ; then + if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then _PATCH_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} fi fi done for _S in ${PATCH_SITES}; do _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} - if [ -n "$(_S_TEMP)" } ; then + if [ -n "${_S_TEMP}" } ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do - if [ -z "$$(_PATCH_SITE_SUBDIR_${_group})" ] ; then + if [ -z "$${_PATCH_SITE_SUBDIR_${_group}}" ] ; then _S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + 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%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP+= ${site} else for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do @@ -306,15 +306,15 @@ done fi done - if [ -n "$(_PATCH_SITE_SUBDIR_DEFAULT)" ] ; then + if [ -n "${_PATCH_SITE_SUBDIR_DEFAULT}" ] ; then _S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*} - if [ -z "$(_S_TEMP)" ] ; then + 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%/*} - if [ -z "$(_S_TEMP_TEMP)" ] ; then + if [ -z "${_S_TEMP_TEMP}" ] ; then PATCH_SITES_TMP+= ${site} else for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do @@ -332,11 +332,11 @@ _G_TEMP= DEFAULT for _P in ${PATCHFILES}; do _P_TEMP= ${_P:S/^${_P:C/:[^:]+$//}//} - if [ -n "$(_P_TEMP)" ] ; then + if [ -n "${_P_TEMP}" ] ; then for _group in ${_P_TEMP:S/^://:S/,/ /g}; do - if [ -z "$$(_PATCH_SITES_${_group})" ] ; then + if [ -z "$${_PATCH_SITES_${_group}}" ] ; then _G_TEMP_TEMP= ${_G_TEMP:M/${_group}/} - if [ -z "$(_G_TEMP_TEMP)" ] ; then + if [ -z "${_G_TEMP_TEMP}" ] ; then _G_TEMP+= ${_group} _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}} fi @@ -377,7 +377,7 @@ exit 1 fi ${ECHO_MSG} "=> $file doesn't seem to exist in ${_DISTDIR}." - if [ ! -z "$select" ] ; then + if [ ! -z "${select}" ] ; then __PATCH_SITES_TMP= for group in $select; do if [ ! -z $${_PATCH_SITES_${group}} ] ; then