Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2023-05-24 06:14:03 +0200
committerErich Eckner <git@eckner.net>2023-05-24 06:14:03 +0200
commitb8feb744e437502a6f126621e7ea087601e0454f (patch)
treed5e7c5b09aa1ad3ae78e2111e494ad9dd587a9be /bin
parentaaa455e2e41e10fdc75d61c7db29e3e5e5dd525f (diff)
cleanup no-more-working option "--diff|d" from bin/build-packages
Diffstat (limited to 'bin')
-rwxr-xr-xbin/build-packages42
1 files changed, 1 insertions, 41 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 56c60c3..95bcf8d 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -38,12 +38,6 @@ usage() {
>&2 echo 'build-packages: build package(s) on the build-list'
>&2 echo ''
>&2 echo 'possible options:'
- >&2 echo ' -d|--diff source-directory:'
- >&2 echo ' Apply the diff between $source-directory/PKGBUILD and'
- >&2 echo ' $source-directory/../../trunk/PKGBUILD before building.'
- >&2 echo ' This option is intended for building from trunk where minor'
- >&2 echo ' fixes did not get released yet. Hence, it conflicts intentionally'
- >&2 echo ' with -n, -l, -t or -x and it requires -p.'
>&2 echo ' -h|--help: Show this help and exit.'
>&2 echo ' -l|--local pkgname.git-revision.git-mod-revision.repository.architecture:'
>&2 echo ' Build the given package without asking / reporting to the'
@@ -90,8 +84,7 @@ usage() {
}
eval set -- "$(
- getopt -o d:hl:n:p:s:t:ux \
- --long diff: \
+ getopt -o hl:n:p:s:t:ux \
--long help \
--long local: \
--long prefer: \
@@ -102,7 +95,6 @@ eval set -- "$(
)"
unset count
-unset diff_source_dir
unset forced_package
unset forced_straws
unset prefered_package
@@ -112,14 +104,6 @@ timeout=0
while true
do
case "$1" in
- -d|--diff)
- shift
- if [ -n "${diff_source_dir}" ]; then
- >&2 echo 'Option -d, --diff can be given only once.'
- usage
- fi
- diff_source_dir="$1"
- ;;
-h|--help)
usage 0
;;
@@ -173,17 +157,6 @@ if [ $# -ne 0 ]; then
usage
fi
-if [ -n "${diff_source_dir}" ]; then
- if [ -n "${count}" ] || \
- [ -n "${forced_package}" ] || \
- [ "${timeout}" -ne 0 ] || \
- ${exit_after_failure} || \
- [ -z "${prefered_package}" ]; then
- >&2 echo 'Conflicting flags.'
- usage
- fi
-fi
-
if [ -n "${forced_package}" ]; then
if [ -n "${count}" ] || \
[ "${timeout}" -ne 0 ] || \
@@ -296,19 +269,6 @@ while [ "${count}" -ne 0 ] && \
assignment_was_any=false
fi
- if [ -n "${diff_source_dir}" ] &&
- [ "${prefered_package}" != "${package}" ]; then
- >&2 echo 'The prefered package was not handed out.'
- >&2 echo 'Because -d was given, I will abort.'
- # shellcheck disable=SC2029
- ssh -o PasswordAuthentication=No \
- -i "${master_build_server_identity}" \
- -p "${master_build_server_port}" \
- "${master_build_server_user}@${master_build_server}" \
- 'return-assignment' 'ABORT'
- exit 2
- fi
-
if [ "${git_revision##*-}" = 'HEAD' ]; then
git_revision=$(
repo_name="${git_revision%-*}"