<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/bc62135f4b735343e8626dd92ed79416cccea0ed">https://github.com/macports/mpbb/commit/bc62135f4b735343e8626dd92ed79416cccea0ed</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 bc62135 mpbb-print-info: Also print variants
</span>bc62135 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bc62135f4b735343e8626dd92ed79416cccea0ed
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 13 16:04:10 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mpbb-print-info: Also print variants
</span>---
mpbb-print-info | 48 ++++++++++++++++++++++--------------------------
1 file changed, 22 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-print-info b/mpbb-print-info
</span><span style='display:block; white-space:pre;color:#808080;'>index b2be765..e967131 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-print-info
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-print-info
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@ print-info-usage() {
</span> # "prog" is defined in mpbb-help.
# shellcheck disable=SC2154
cat <<EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-usage: $prog [<global opts>] port-get-info [<port>]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+usage: $prog [<global opts>] print-info [<port>]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Prints the macOS and Xcode versions and the version, revision, and last
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-modified commit of the port if given.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Prints the macOS and Xcode versions and the version, revision, variants,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and last modified commit of the port if given.
</span>
Run \`$prog help' for global options and a list of other subcommands.
EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,45 +21,43 @@ EOF
</span> print-info() {
local port=${1-}
if [[ -n $port ]]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- local portversion portrevision portdir portcommit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local portversion portrevision portvariants portdir portcommit
</span>
# $option_prefix is set in mpbb
# shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portversion=$("${option_prefix}/bin/port" info --index --line --version "$port") || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n $portversion ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if portversion=$("${option_prefix}/bin/port" info --index --line --version "$port"); then
</span> printf "portversion=%s\n" "$portversion"
fi
# $option_prefix is set in mpbb
# shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portrevision=$("${option_prefix}/bin/port" info --index --line --revision "$port") || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n $portrevision ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if portrevision=$("${option_prefix}/bin/port" info --index --line --revision "$port"); then
</span> printf "portrevision=%s\n" "$portrevision"
fi
# $option_prefix is set in mpbb
# shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portdir=$("${option_prefix}/bin/port" dir "$port") || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n $portdir ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- portcommit=$(git -C "$portdir" log -n 1 --pretty=format:%H .) || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n $portcommit ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if portvariants=$("${option_prefix}/bin/port-tclsh" tools/canonical-variants.tcl "$port"); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "portvariants=%s\n" "$portvariants"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $option_prefix is set in mpbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # shellcheck disable=SC2154
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if portdir=$("${option_prefix}/bin/port" dir "$port"); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if portcommit=$(git -C "$portdir" log -n 1 --pretty=format:%H .); then
</span> printf "portcommit=%s\n" "$portcommit"
fi
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: print portvariants
</span> fi
if command -v sw_vers >/dev/null; then
local macosversion macosbuild
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macosversion=$(sw_vers -productVersion) || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n $macosversion ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosbuild=$(sw_vers -buildVersion) || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -z $macosbuild ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "macosversion=%s\n" "$macosversion"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if macosversion=$(sw_vers -productVersion); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if macosbuild=$(sw_vers -buildVersion); then
</span> printf "macosversion=%s (%s)\n" "$macosversion" "$macosbuild"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "macosversion=%s\n" "$macosversion"
</span> fi
fi
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,13 +65,11 @@ print-info() {
</span> if command -v xcodebuild >/dev/null; then
local xcodeversion xcodebuild
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xcodeversion=$(xcodebuild -version | sed -En 's,^Xcode (.*)$,\1,p') || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -n $xcodeversion ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xcodebuild=$(xcodebuild -version | sed -En 's,^Build ?[Vv]ersion:? (.*)$,\1,p') || true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [[ -z $xcodebuild ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "xcodeversion=%s\n" "$xcodeversion"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if xcodeversion=$(xcodebuild -version | sed -En 's,^Xcode (.*)$,\1,p'); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if xcodebuild=$(xcodebuild -version | sed -En 's,^Build ?[Vv]ersion:? (.*)$,\1,p'); then
</span> printf "xcodeversion=%s (%s)\n" "$xcodeversion" "$xcodebuild"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "xcodeversion=%s\n" "$xcodeversion"
</span> fi
fi
fi
</pre><pre style='margin:0'>
</pre>