<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/17f1018819b0cc20e4ad61c5bbb9b407968519fc">https://github.com/macports/mpbb/commit/17f1018819b0cc20e4ad61c5bbb9b407968519fc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 17f1018 Fix check for already installed port
</span>17f1018 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 17f1018819b0cc20e4ad61c5bbb9b407968519fc
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Aug 9 08:39:38 2017 +1000
<span style='display:block; white-space:pre;color:#404040;'> Fix check for already installed port
</span>---
mpbb-install-dependencies | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-install-dependencies b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;color:#808080;'>index e0bcdd4..d95d66e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +68,9 @@ install-dependencies() {
</span> echo "$dependencies" | sed -E 's/^/ - /' | tee -a "$log_status_dependencies"
echo >> "$log_status_dependencies"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # save $@ since 'set' is used below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ orig_args="$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Check whether any of the dependencies have previously failed
failcachecounter=0
while read -r dependency; do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,8 +164,8 @@ install-dependencies() {
</span>
# $option_prefix and $thisdir are set in mpbb
# shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -f $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" "$@") ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$@ Already installed, not activating dependencies"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [[ -f $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" ${orig_args}) ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "${orig_args} Already installed, not activating dependencies"
</span> else
echo "Activating all dependencies..."
# $option_prefix is set by mpbb, and dependencies isn't quoted on purpose
</pre><pre style='margin:0'>
</pre>