From 964c0e2b4ed0755746ac4d406e7b229bbeb2aa32 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 4 Apr 2015 19:50:33 +0200 Subject: [PATCH] hooks/pre-configure/install-wrapper: also drop -o/-g, they break in xbps-uunshare environments. --- common/hooks/pre-configure/install-wrapper | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/hooks/pre-configure/install-wrapper b/common/hooks/pre-configure/install-wrapper index 8249b6695a6..82b61c27df6 100755 --- a/common/hooks/pre-configure/install-wrapper +++ b/common/hooks/pre-configure/install-wrapper @@ -1,5 +1,5 @@ #!/bin/bash -# install-wrapper - run install(1), but never strip +# install-wrapper - run install(1), but never strip or chown set -e # taken from install (GNU coreutils) 8.23 @@ -8,7 +8,7 @@ longopts='backup::,compare,directory,group:,mode:,owner:,preserve-timestamps,\ strip:,strip-program:,suffix:,target-directory:,no-target-directory,verbose,\ preserve-context,context::,help,version' -parsed="$(getopt -o "$opts" --long "$longopts" -n 'install(wrapper)' -- "$@")" +parsed="$(getopt -o "$opts" --long "$longopts" -n 'install-wrapper' -- "$@")" eval set -- "$parsed" iopts=() @@ -21,13 +21,15 @@ while :; do --strip-program) echo "install-wrapper: dropping strip program '$2'." 1>&2 shift 2;; + -g|--group|-o|--owner) + echo "install-wrapper: dropping option $1 $2." 1>&2 + shift 2;; -b|-c|-C|--compare|-d|--directory|-D|-p|--preserve-timestamps|\ -T|--no-target-directory|-v|--verbose|--preserve-context|-Z|\ --help|--version) iopts+=("$1") shift;; - -g|--group|-m|--mode|-o|--owner|-S|--suffix|-t|--target-directory|\ - --backup|--context) + -m|--mode|-S|--suffix|-t|--target-directory|--backup|--context) iopts+=("$1" "$2") shift 2;; --)