mirror of
https://github.com/macports/mpbb.git
synced 2026-07-12 18:18:44 -07:00
mpbb: Remove --port and --prefix from subcommands
The updated Buildbot configuration is now live. Shortest deprecation periods ever! git-svn-id: https://svn.macports.org/repository/macports/contrib/mp-buildbot@152624 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
@@ -47,7 +47,6 @@ parseopt prefix:,work-dir: "$@" || exit
|
||||
# Use sensible defaults for options that weren't set on the command line.
|
||||
# shellcheck disable=SC2154
|
||||
{
|
||||
: "${option_port=}"
|
||||
: "${option_prefix=/opt/local}"
|
||||
: "${option_work_dir=${PWD:-/tmp/mp-buildbot}}"
|
||||
}
|
||||
|
||||
+1
-1
@@ -130,7 +130,7 @@ svn-checkout() {
|
||||
|
||||
checkout() {
|
||||
local args
|
||||
parseopt git::,jobs-url:,ports-branch:,ports-commit:,ports-url:,prefix:,svn::,svn-url: "$@" \
|
||||
parseopt git::,jobs-url:,ports-branch:,ports-commit:,ports-url:,svn::,svn-url: "$@" \
|
||||
|| return
|
||||
# shellcheck disable=SC2086
|
||||
set -- ${args+"${args[@]}"}
|
||||
|
||||
+1
-6
@@ -18,13 +18,8 @@ EOF
|
||||
}
|
||||
|
||||
cleanup() {
|
||||
local args
|
||||
parseopt prefix: "$@" || return
|
||||
# shellcheck disable=SC2086
|
||||
set -- ${args+"${args[@]}"}
|
||||
|
||||
# if this is the very first build, selfupdate did not install port yet
|
||||
# $option_prefix is set by parseopt
|
||||
# $option_prefix is set in mpbb
|
||||
# shellcheck disable=SC2154
|
||||
if [ ! -e "${option_prefix}/bin/port" ]; then
|
||||
echo "---> Skipping cleanup"
|
||||
|
||||
@@ -31,7 +31,7 @@ EOF
|
||||
|
||||
gather-archives() {
|
||||
local args
|
||||
parseopt archive-site:,prefix:,staging-dir: "$@" || return
|
||||
parseopt archive-site:,staging-dir: "$@" || return
|
||||
: "${option_archive_site=https://packages.macports.org}"
|
||||
# shellcheck disable=SC2154
|
||||
: "${option_staging_dir=${option_work_dir}/archive-staging}"
|
||||
|
||||
@@ -26,14 +26,7 @@ get-maintainers() {
|
||||
}
|
||||
|
||||
install-dependencies() {
|
||||
local args
|
||||
parseopt port:,prefix: "$@" || return
|
||||
# shellcheck disable=SC2154
|
||||
: "${option_port=}"
|
||||
# shellcheck disable=SC2086
|
||||
set -- ${args+"${args[@]}"}
|
||||
|
||||
local port=${1-${option_port}}
|
||||
local port=${1-}
|
||||
if [[ -z $port ]]; then
|
||||
err "Must specify a port"
|
||||
return 1
|
||||
|
||||
+1
-8
@@ -26,14 +26,7 @@ get-maintainers() {
|
||||
}
|
||||
|
||||
install-port() {
|
||||
local args
|
||||
parseopt port:,prefix: "$@" || return
|
||||
# shellcheck disable=SC2154
|
||||
: "${option_port=}"
|
||||
# shellcheck disable=SC2086
|
||||
set -- ${args+"${args[@]}"}
|
||||
|
||||
local port=${1-${option_port}}
|
||||
local port=${1-}
|
||||
if [[ -z $port ]]; then
|
||||
err "Must specify a port"
|
||||
return 1
|
||||
|
||||
@@ -19,11 +19,6 @@ EOF
|
||||
}
|
||||
|
||||
selfupdate() {
|
||||
local args
|
||||
parseopt prefix: "$@" || return
|
||||
# shellcheck disable=SC2086
|
||||
set -- ${args+"${args[@]}"}
|
||||
|
||||
# $option_prefix is set in mpbb
|
||||
# shellcheck disable=SC2154
|
||||
if [ ! -f "${option_prefix}/bin/port" ]; then
|
||||
|
||||
Reference in New Issue
Block a user