<pre style='margin:0'>
Lawrence Velázquez (larryv) pushed a commit to branch mprsyncup-polish
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/f68f491524a3f3851a58f3de4140a1f18dd43c32">https://github.com/macports/macports-infrastructure/commit/f68f491524a3f3851a58f3de4140a1f18dd43c32</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f68f491524a3f3851a58f3de4140a1f18dd43c32
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Wed Nov 16 17:48:23 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> mprsyncup: Use subshells instead of pushd/popd
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> POSIX shell doesn't recognize pushd and popd. Using cd inside a subshell
</span><span style='display:block; white-space:pre;color:#404040;'> has the same effect.
</span>---
jobs/mprsyncup | 52 ++++++++++++++++++++++++++++------------------------
1 file changed, 28 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/jobs/mprsyncup b/jobs/mprsyncup
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ee786d..c21c6c4 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/jobs/mprsyncup
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/jobs/mprsyncup
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,33 +150,37 @@ fi
</span>
if [ "${RBASE_CHANGED}" -eq 1 ]; then
PORTS_CHANGED=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # build MP in a private location for indexing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pushd "${RBASE}" >> /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./configure \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix="${PREFIX}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-install-group="$(id -gn)" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-install-user="$(id -un)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JOBS=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$(uname -s)" = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JOBS="$(sysctl -n hw.activecpu)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make -j"$JOBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make distclean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- popd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build MP in a private location for indexing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${RBASE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix="${PREFIX}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-install-group="$(id -gn)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-install-user="$(id -un)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JOBS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$(uname -s)" = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JOBS="$(sysctl -n hw.activecpu)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make -j"$JOBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make distclean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span> fi
if [ "${PORTS_CHANGED}" -eq 1 ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # generate platform-specific indexes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pushd "${PORTS}" >> /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Intentionally allow $PLATFORMS to be split on whitespace.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for PLATFORM in $PLATFORMS; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INDEX="PortIndex_darwin_${PLATFORM}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PORTINDEX} -p "macosx_${PLATFORM}" -o "${INDEX}" | ${SED} "s/^/Updating ${INDEX}: /" | expand -t 40,48,56,64,72,80 &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wait
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- popd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # generate platform-specific indexes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${PORTS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Intentionally allow $PLATFORMS to be split on whitespace.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for PLATFORM in $PLATFORMS; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INDEX="PortIndex_darwin_${PLATFORM}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PORTINDEX} -p "macosx_${PLATFORM}" -o "${INDEX}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | ${SED} "s/^/Updating ${INDEX}: /" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | expand -t 40,48,56,64,72,80 &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wait
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span> fi
${MKDIR} -p "${RSYNCROOT}/release/ports"
</pre><pre style='margin:0'>
</pre>