[151781] contrib/mp-buildbot

[mojca at macports.org]

Revision: 151781
          https://trac.macports.org/changeset/151781
Author:   mojca at macports.org
Date:     2016-08-21 16:20:42 -0700 (Sun, 21 Aug 2016)
Log Message:
-----------
mp-buildbot: cleanup the syntax

Modified Paths:
--------------
    contrib/mp-buildbot/mpbb-install-dependencies
    contrib/mp-buildbot/mpbb-install-port

Modified: contrib/mp-buildbot/mpbb-install-dependencies
===================================================================
--- contrib/mp-buildbot/mpbb-install-dependencies	2016-08-21 22:55:06 UTC (rev 151780)
+++ contrib/mp-buildbot/mpbb-install-dependencies	2016-08-21 23:20:42 UTC (rev 151781)
@@ -10,7 +10,9 @@
 }
 
 get-maintainers() {
-    ${option_prefix}/bin/port info --index --maintainers --line $1 | tr ',' '\n' | sort | uniq | tr '\n' ',' | \
+    # $option_prefix is set in mpbb
+    # shellcheck disable=SC2154
+    "${option_prefix}/bin/port" info --index --maintainers --line "$@" | tr ',' '\n' | sort | uniq | tr '\n' ',' | \
         awk '{gsub(/(open|no)maintainer(@macports.org)?,/, ""); print}' | \
         tr '$' '\n' | sed 's/,$//' | tr '@' ';'
 }
@@ -52,7 +54,7 @@
     dependencies_counter=1
 
     echo "Installing $dependencies_count dependencies of $option_port:" | tee -a "$log_status_dependencies"
-    echo "$(echo "$dependencies" | sed -E 's/^/ - /')" | tee -a "$log_status_dependencies"
+    echo "$dependencies" | sed -E 's/^/ - /' | tee -a "$log_status_dependencies"
     echo >> "$log_status_dependencies"
 
     echo "$dependencies" | while read -r dependency; do
@@ -69,7 +71,7 @@
         if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants ${option_variants}; then
             echo "Build of dependency '${depname}' failed, aborting." >&2
             echo "[FAIL]" >> "$log_status_dependencies"
-            echo "Building '${option_port}' ... [ERROR] (failed to install dependency '${depname}') maintainers: $(get-maintainers "${option_port} ${depname}")." >> "$log_subports_progress"
+            echo "Building '${option_port}' ... [ERROR] (failed to install dependency '${depname}') maintainers: $(get-maintainers "${option_port}" "${depname}")." >> "$log_subports_progress"
             return 1
         else
             echo "[OK]" >> "$log_status_dependencies"

Modified: contrib/mp-buildbot/mpbb-install-port
===================================================================
--- contrib/mp-buildbot/mpbb-install-port	2016-08-21 22:55:06 UTC (rev 151780)
+++ contrib/mp-buildbot/mpbb-install-port	2016-08-21 23:20:42 UTC (rev 151781)
@@ -10,7 +10,9 @@
 }
 
 get-maintainers() {
-    ${option_prefix}/bin/port info --index --maintainers --line $1 | tr ',' '\n' | sort | uniq | tr '\n' ',' | \
+    # $option_prefix is set in mpbb
+    # shellcheck disable=SC2154
+    "${option_prefix}/bin/port" info --index --maintainers --line "$@" | tr ',' '\n' | sort | uniq | tr '\n' ',' | \
         awk '{gsub(/(open|no)maintainer(@macports.org)?,/, ""); print}' | \
         tr '$' '\n' | sed 's/,$//' | tr '@' ';'
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160821/ca3a2a6b/attachment.html>