PERFORCE change 102721 for review
Gabor Kovesdan
gabor at FreeBSD.org
Sat Jul 29 13:34:19 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=102721
Change 102721 by gabor at gabor_spitfire on 2006/07/29 13:33:30
Whitespace cleanup. One tab in each variable assignation.
Affected files ...
.. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#11 edit
Differences ...
==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#11 (text+ko) ====
@@ -11,7 +11,7 @@
${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES."
exit 1
fi
- _MASTER_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"`
+ _MASTER_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"`
done
else
_MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}
@@ -21,19 +21,19 @@
_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
if [ -n "${_S_TEMP}" ] ; then
for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do
- _G_TEMP= ${_group}
+ _G_TEMP= ${_group}
if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then
${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES."
exit 1
fi
if [ -n "${_MASTER_SITES_${_group}}" ] ; then
- _MASTER_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ _MASTER_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
fi
done
else
if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then
- _MASTER_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"`
+ _MASTER_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"`
fi
fi
done
@@ -42,7 +42,7 @@
if [ -n "${_S_TEMP}" ] ; then
for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do
if [ -z "$${_MASTER_SITE_SUBDIR_${_group}}" ] ; then
- MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"`
+ MASTER_SITES_TMP= `${ECHO_CMD} $${_MASTER_SITES_${_group}} | ${SED} "s^%SUBDIR%/^^"`
else
_S_TEMP_TEMP= $${_MASTER_SITES_${_group}:M*%SUBDIR%/*}
if [ -z "${_S_TEMP_TEMP}" ] ; then
@@ -55,7 +55,7 @@
MASTER_SITES_TMP+= ${site}
else
for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do
- MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
done
fi
done
@@ -77,27 +77,27 @@
MASTER_SITES_TMP+= ${site}
else
for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do
- MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"
+ MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"
done
fi
done
fi
else
- MASTER_SITES_TMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"`
+ MASTER_SITES_TMP= `${ECHO_CMD} ${_MASTER_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"`
fi
-_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP}
+_MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP}
MASTER_SITES_TMP=
# The primary backup site.
if [ -z "${MASTER_SITE_BACKUP}" ] ; then
MASTER_SITE_BACKUP= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
fi
-MASTER_SITE_BACKUP:= `${ECHO_CMD} ${MASTER_SITE_BACKUP} | ${SED} "s^\${DIST_SUBDIR}/^^"`
+MASTER_SITE_BACKUP:= `${ECHO_CMD} ${MASTER_SITE_BACKUP} | ${SED} "s^\${DIST_SUBDIR}/^^"`
# 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
- _MASTER_SITE_OVERRIDE= ${MASTER_SITE_BACKUP}
+ _MASTER_SITE_OVERRIDE= ${MASTER_SITE_BACKUP}
_MASTER_SITE_BACKUP=
else
_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE}
@@ -125,7 +125,7 @@
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
fi
_MASTER_SITES_ALL= ${_MASTER_SITES_DEFAULT}
-_G_TEMP= DEFAULT
+_G_TEMP= DEFAULT
for _D in ${DISTFILES}; do
_D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//}
if [ -n "${_D_TEMP}" ] ; then
@@ -138,7 +138,7 @@
fi
fi
done
- _DISTFILES+= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"`
+ _DISTFILES+= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"`
else
_DISTFILES+= ${_D}
fi
@@ -150,17 +150,17 @@
#
# Sort the master site list according to the patterns in MASTER_SORT
#
-MASTER_SORT_REGEX+= `${ECHO_CMD} ${MASTER_SORT} | ${SED} -e "s|.|\\.|g" -e "s|^|://[^/]*|" -e "s|$|/|"`
-MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; }
+MASTER_SORT_REGEX+= `${ECHO_CMD} ${MASTER_SORT} | ${SED} -e "s|.|\\.|g" -e "s|^|://[^/]*|" -e "s|$|/|"`
+MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S|\\|\\\\|g}"; }
.for srt in ${MASTER_SORT_REGEX}
-MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; }
+MASTER_SORT_AWK+= /${srt:S|/|\\/|g}/ { good["${srt:S|\\|\\\\|g}"] = good["${srt:S|\\|\\\\|g}"] " " $$0 ; next; }
.endfor
-MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; }
+MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; }
-SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-DEFAULT
-SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-DEFAULT
-SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-ALL
-SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-ALL
+SORTED_MASTER_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-DEFAULT
+SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-DEFAULT
+SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} master-sites-ALL
+SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-sites-ALL
# Sort the master site list according to the patterns in MASTER_SORT
# according to grouping rules (:something)
@@ -177,19 +177,19 @@
done
for _file in ${DISTFILES}; do
- file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'`
- select=`${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'`
- force_fetch=false
- filebasename=`${BASENAME} $file`
+ file= `${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$//'`
+ select= `${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'`
+ force_fetch= false
+ filebasename= `${BASENAME} $file`
for afile in ${FORCE_FETCH}; do
afile=`${BASENAME} $afile`
if [ "x$afile" = "x$filebasename" ]; then
- force_fetch=true
+ force_fetch= true
fi
done
if [ ! -f $file -a ! -f $filebasename -o "$force_fetch" = "true" ]; then
- DIR=${DIST_SUBDIR}
- pattern="${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`"
+ DIR= ${DIST_SUBDIR}
+ pattern= "${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`"
if [ -L $file -o -L $filebasename ]; then
${ECHO_MSG} "=> ${_DISTDIR}/$file is a broken symlink."
${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"
@@ -213,25 +213,25 @@
___MASTER_SITES_TMP=
for group in $select; do
if [ ! -z "$${_MASTER_SITES_${group}n" ] ; then
- eval ___MASTER_SITES_TMP="$${_MASTER_SITES_${group}}"
- __MASTER_SITES_TMP="${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}"
+ eval ___MASTER_SITES_TMP= "$${_MASTER_SITES_${group}}"
+ __MASTER_SITES_TMP= "${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}"
fi
done
___MASTER_SITES_TMP=
- SORTED_MASTER_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__MASTER_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}"
+ SORTED_MASTER_SITES_CMD_TMP= "${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__MASTER_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}"
else
- SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}"
+ SORTED_MASTER_SITES_CMD_TMP= "${SORTED_MASTER_SITES_DEFAULT_CMD}"
fi
for site in `eval $SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do
${ECHO_MSG} "=> Attempting to fetch from ${site}."
- DIR=${DIST_SUBDIR}
- CKSIZE=`${GREP} "^SIZE (${DIR:+$DIR/}$file)" ${MD5_FILE} | ${AWK} '{print $4}'`
+ DIR= ${DIST_SUBDIR}
+ CKSIZE= `${GREP} "^SIZE (${DIR:+$DIR/}$file)" ${MD5_FILE} | ${AWK} '{print $4}'`
case ${file} in
*/*)
${MKDIR} ${file%/*}; \
- args="-o ${file} ${site}${file}";;
+ args= "-o ${file} ${site}${file}";;
*)
- args=${site}${file};;
+ args= ${site}${file};;
esac
if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${args} ${FETCH_AFTER_ARGS}; then
continue 2
@@ -245,38 +245,38 @@
if [ -z "${PATCHFILES}" ] ; then
for _S in ${PATCH_SITES}; do
- _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
+ _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
if [ -n "${_S_TEMP}" ; then \
for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do
- _G_TEMP= ${_group}
+ _G_TEMP= ${_group}
if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then
${ECHO_MSG} "The words all, ALL and default are reserved and cannot be"
${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
exit 1
fi
- _PATCH_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
+ _PATCH_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
done
else
- _PATCH_SITES_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
+ _PATCH_SITES_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
fi
done
for _S in ${PATCH_SITE_SUBDIR}; do
- _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
+ _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
if [ -n "${_S_TEMP}" ] ; then
for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do
- _G_TEMP= ${_group}
+ _G_TEMP= ${_group}
if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then
${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
exit 1
fi
if [ -n "${_PATCH_SITES_${_group}}" ] ; then
- _PATCH_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ _PATCH_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
fi
done
else
if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then
- _PATCH_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ _PATCH_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
fi
fi
done
@@ -296,7 +296,7 @@
PATCH_SITES_TMP+= ${site}
else
for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do
- PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
dine
fi
done
@@ -315,16 +315,16 @@
for site in ${_PATCH_SITES_DEFAULT}; do
_S_TEMP_TEMP= ${site:M*%SUBDIR%/*}
if [ -z "${_S_TEMP_TEMP}" ] ; then
- PATCH_SITES_TMP+= ${site}
+ PATCH_SITES_TMP+= ${site}
else
for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do
- PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
done
fi
done
fi
else
- PATCH_SITES_TMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"`
+ PATCH_SITES_TMP= `${ECHO_CMD} ${_PATCH_SITES_DEFAULT} | ${SED} "s^%SUBDIR%/^^"`
fi
_PATCH_SITES_DEFAULT:= ${PATCH_SITES_TMP}
PATCH_SITES_TMP=
@@ -337,14 +337,14 @@
if [ -z "$${_PATCH_SITES_${_group}}" ] ; then
_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}
if [ -z "${_G_TEMP_TEMP}" ] ; then
- _G_TEMP+= ${_group}
- _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}}
+ _G_TEMP+= ${_group}
+ _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}}
fi
fi
done
- _PATCHFILES+= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"`
+ _PATCHFILES+= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"`
else
- _PATCHFILES+= ${_P}
+ _PATCHFILES+= ${_P}
fi
done
for _S in ${PATCH_SITES}; do
@@ -359,14 +359,14 @@
cd ${_DISTDIR}
for _file in ${PATCHFILES}; do
- file=`${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$$//'`
- select=`${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'`
- force_fetch=false
- filebasename=`${BASENAME} $file`
+ file= `${ECHO_CMD} $_file | ${SED} -E -e 's/:[^:]+$$//'`
+ select= `${ECHO_CMD} ${_file#${file}} | ${SED} -e 's/^://' -e 's/,/ /g'`
+ force_fetch= false
+ filebasename= `${BASENAME} $file`
for afile in ${FORCE_FETCH}; do
- afile=`${BASENAME} $afile`
+ afile= `${BASENAME} $afile`
if [ "x$afile" = "x$filebasename" ]; then
- force_fetch=true
+ force_fetch =true
fi
done
if [ ! -f $file -a ! -f $filebasename -o "$force_fetch" = "true" ]; then
@@ -381,26 +381,26 @@
__PATCH_SITES_TMP=
for group in $select; do
if [ ! -z $${_PATCH_SITES_${group}} ] ; then
- eval ___PATCH_SITES_TMP="$${_PATCH_SITES_${group}}"
- __PATCH_SITES_TMP="${__PATCH_SITES_TMP} ${___PATCH_SITES_TMP}"
+ eval ___PATCH_SITES_TMP= "$${_PATCH_SITES_${group}}"
+ __PATCH_SITES_TMP= "${__PATCH_SITES_TMP} ${___PATCH_SITES_TMP}"
fi
done
___PATCH_SITES_TMP=
- SORTED_PATCH_SITES_CMD_TMP="${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}"
+ SORTED_PATCH_SITES_CMD_TMP= "${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} ${__PATCH_SITES_TMP} | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}"
else
- SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}"
+ SORTED_PATCH_SITES_CMD_TMP= "${SORTED_PATCH_SITES_DEFAULT_CMD}"
fi
for site in `eval $SORTED_PATCH_SITES_CMD_TMP`; do
${ECHO_MSG} "=> Attempting to fetch from ${site}."
- DIR=${DIST_SUBDIR}
- pattern="${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`"
- CKSIZE=`${GREP} "^SIZE ($pattern)" ${MD5_FILE} | ${AWK} '{print $4}'`
+ DIR= ${DIST_SUBDIR}
+ pattern= "${DIR:+$DIR/}`${ECHO_CMD} $file | ${SED} -e 's/\./\\\\./g'`"
+ CKSIZE= `${GREP} "^SIZE ($pattern)" ${MD5_FILE} | ${AWK} '{print $4}'`
case ${file} in
*/*)
${MKDIR} ${file%/*}; \
- args="-o ${file} ${site}${file}";;
+ args= "-o ${file} ${site}${file}";;
*)
- args=${site}${file};;
+ args= ${site}${file};;
esac
if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${args} ${FETCH_AFTER_ARGS}; then
continue 2
More information about the p4-projects
mailing list