<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch variant-support
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/9ff38f0a7ee2bd8230bbd54f0e740f27d19047ec">https://github.com/macports/mpbb/commit/9ff38f0a7ee2bd8230bbd54f0e740f27d19047ec</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9ff38f0a7ee2bd8230bbd54f0e740f27d19047ec
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Mar 11 16:42:45 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> Fix (or silence) install-deps shellcheck warnings
</span>---
mpbb-install-dependencies | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 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 da76f46..d962f3d 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;'>@@ -37,12 +37,13 @@ install-dependencies() {
</span>
# prepare the log file and make sure to start with an empty one
mkdir -p "${option_log_dir}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- > "$log_status_dependencies"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ :> "$log_status_dependencies"
</span>
# calculate list of dependencies in-order
# $option_prefix and $thisdir are set in mpbb
# shellcheck disable=SC2154
dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "$port" "$portvariants")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2181
</span> if [ $? -ne 0 ]; then
echo "Calculating dependencies for '$port' failed, aborting." >&2
echo "Building '$port' ... [ERROR] (failed to calculate dependencies) maintainers: $(get-maintainers "$port")." >> "$log_subports_progress"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +63,7 @@ install-dependencies() {
</span> echo >> "$log_status_dependencies"
# save $@ since 'set' is used below
<span style='display:block; white-space:pre;background:#ffe0e0;'>- orig_args="$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ orig_args="$*"
</span>
# Check whether any of the dependencies have previously failed
failcachecounter=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +89,8 @@ install-dependencies() {
</span> return 1
fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # option_work_dir is set in mpbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2154
</span> rm -f "${option_work_dir}/all_ports"
while read -r dependency; do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,8 +119,7 @@ install-dependencies() {
</span> # Update failcache
# $depvariants isn't quoted on purpose
# shellcheck disable=SC2086
<span style='display:block; white-space:pre;background:#ffe0e0;'>- failcache_failure "$depname" $depvariants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ! failcache_failure "$depname" $depvariants; then
</span> err "failcache_failure $depname $depvariants failed."
return 1
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,8 +130,7 @@ install-dependencies() {
</span> # Remove failcache if it exists
# $depvariants isn't quoted on purpose
# shellcheck disable=SC2086
<span style='display:block; white-space:pre;background:#ffe0e0;'>- failcache_success "$depname" $depvariants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ! failcache_success "$depname" $depvariants; then
</span> err "failcache_success $depname $depvariants failed."
return 1
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,8 +148,8 @@ install-dependencies() {
</span> # activate everything now that we know it's all built and installed
# ... but only we're actually going to build the requested port
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # $option_prefix and $thisdir are set in mpbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # shellcheck disable=SC2154
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $option_prefix and $thisdir are set in mpbb, orig_args is not quoted on purpose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2154,SC2086
</span> if [[ -f $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" ${orig_args}) ]]; then
echo "${orig_args} Already installed, not activating dependencies"
else
</pre><pre style='margin:0'>
</pre>