PERFORCE change 103659 for review
Gabor Kovesdan
gabor at FreeBSD.org
Fri Aug 11 20:00:27 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103659
Change 103659 by gabor at 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
More information about the p4-projects
mailing list