[152355] contrib/mp-buildbot

[larryv at macports.org]

Revision: 152355
          https://trac.macports.org/changeset/152355
Author:   larryv at macports.org
Date:     2016-09-04 13:55:03 -0700 (Sun, 04 Sep 2016)
Log Message:
-----------
mpbb: Replace "return $?" with "return"

A bare "return" returns the exit status of the last command executed.

Modified Paths:
--------------
    contrib/mp-buildbot/mpbb-checkout
    contrib/mp-buildbot/mpbb-gather-archives
    contrib/mp-buildbot/mpbb-list-subports
    contrib/mp-buildbot/mpbb-selfupdate

Modified: contrib/mp-buildbot/mpbb-checkout
===================================================================
--- contrib/mp-buildbot/mpbb-checkout	2016-09-04 20:30:04 UTC (rev 152354)
+++ contrib/mp-buildbot/mpbb-checkout	2016-09-04 20:55:03 UTC (rev 152355)
@@ -31,39 +31,39 @@
     if [[ -d "${tools_svn}/.svn" ]] ; then
         echo "Update macports tools from svn..."
         if [[ -e "${tools_svn}/.svn/lock" ]]; then
-            "$svn" --non-interactive cleanup "${tools_svn}" || return $?
+            "$svn" --non-interactive cleanup "${tools_svn}" || return
         fi
         "$svn" update --non-interactive \
             -r HEAD \
-            "${tools_svn}" || return $?
+            "${tools_svn}" || return
     else
         echo "Checking out macports tools from svn..."
         mkdir -p "${option_work_dir}"
         "$svn" checkout --non-interactive \
             -r HEAD "${svn_url}/base/portmgr/jobs" \
-            "${tools_svn}" || return $?
+            "${tools_svn}" || return
     fi
 
     if [[ -d "${dports_svn}/.svn" ]] ; then
         echo "Update macports from svn..."
         # TODO: add switching of SVN server
         if [[ -e "${dports_svn}/.svn/lock" ]]; then
-            "$svn" --non-interactive cleanup "${dports_svn}" || return $?
+            "$svn" --non-interactive cleanup "${dports_svn}" || return
         fi
         "$svn" update --non-interactive \
             -r "${svn_rev}" \
-            "${dports_svn}" || return $?
+            "${dports_svn}" || return
     else
         echo "Checking out macports from svn..."
         mkdir -p "${option_work_dir}"
         "$svn" checkout --non-interactive \
             -r "${svn_rev}" "${svn_url}/dports" \
-            "${dports_svn}" || return $?
+            "${dports_svn}" || return
     fi
 
     # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
-    (cd "${dports_svn}" && "${option_prefix}/bin/portindex") || return $?
+    (cd "${dports_svn}" && "${option_prefix}/bin/portindex") || return
 
     local -ar mirrors=(aarnet.au cjj.kr fco.it her.gr jnb.za jog.id
                        lil.fr mse.uk nou.nc nue.de osl.no sea.us ykf.ca)
@@ -77,7 +77,7 @@
 EOF
 ) || return
 
-    cat > "${option_work_dir}/sources.conf" <<EOF || return $?
+    cat > "${option_work_dir}/sources.conf" <<EOF || return
 # Automatically overwritten by mpbb-checkout
 # Do not edit !!!
 file://${dports_svn} [default]

Modified: contrib/mp-buildbot/mpbb-gather-archives
===================================================================
--- contrib/mp-buildbot/mpbb-gather-archives	2016-09-04 20:30:04 UTC (rev 152354)
+++ contrib/mp-buildbot/mpbb-gather-archives	2016-09-04 20:55:03 UTC (rev 152355)
@@ -23,7 +23,7 @@
         echo
     fi
 
-    mkdir -p "${option_staging_dir}" || return $?
+    mkdir -p "${option_staging_dir}" || return
 
     status=0
     for archive_path in $("${option_prefix}/bin/port" -q location active); do

Modified: contrib/mp-buildbot/mpbb-list-subports
===================================================================
--- contrib/mp-buildbot/mpbb-list-subports	2016-09-04 20:30:04 UTC (rev 152354)
+++ contrib/mp-buildbot/mpbb-list-subports	2016-09-04 20:55:03 UTC (rev 152355)
@@ -26,7 +26,7 @@
     is_64bit_capable="$(sysctl -n hw.cpu64bit_capable)"
     # $optoin_prefix is set in mpbb
     # shellcheck disable=SC2154
-    ports=$("${option_prefix}/bin/port" -q info --index --line --name "${portname}" "subportof:${portname}" 2>/dev/null) || return $?
+    ports=$("${option_prefix}/bin/port" -q info --index --line --name "${portname}" "subportof:${portname}" 2>/dev/null) || return
     for port in $ports; do
         exclude=0
         exclude_reasons=()

Modified: contrib/mp-buildbot/mpbb-selfupdate
===================================================================
--- contrib/mp-buildbot/mpbb-selfupdate	2016-09-04 20:30:04 UTC (rev 152354)
+++ contrib/mp-buildbot/mpbb-selfupdate	2016-09-04 20:55:03 UTC (rev 152355)
@@ -18,17 +18,17 @@
         macports_distfile=${macports_distname}.tar.bz2
         if [ ! -d ${macports_distname} ]; then
             if [ ! -f ${macports_distfile} ]; then
-                curl -fsLO https://distfiles.macports.org/MacPorts/${macports_distfile} || return $?
+                curl -fsLO https://distfiles.macports.org/MacPorts/${macports_distfile} || return
             fi
-            tar -xjf ${macports_distfile} || return $?
+            tar -xjf ${macports_distfile} || return
         fi
-        cd ${macports_distname} || return $?
-        ./configure --prefix="${option_prefix}" --enable-readline || return $?
-        make -j"$(sysctl -n hw.activecpu)" || return $?
-        make install || return $?
-        cd .. || return $?
-        rm -rf ${macports_distfile} ${macports_distname} || return $?
+        cd ${macports_distname} || return
+        ./configure --prefix="${option_prefix}" --enable-readline || return
+        make -j"$(sysctl -n hw.activecpu)" || return
+        make install || return
+        cd .. || return
+        rm -rf ${macports_distfile} ${macports_distname} || return
     fi
 
-    "${option_prefix}/bin/port" -d selfupdate --nosync || return $?
+    "${option_prefix}/bin/port" -d selfupdate --nosync || return
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160904/a3916505/attachment.html>