From 50c169238b50027032882601d7fde912caa2a2ea Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Tue, 24 Feb 2015 12:47:14 +0100
Subject: scripts/install: fix and improve

Keep the option filtering as it actually prevents lots of package
patching.
---
 scripts/install | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'scripts/install')

diff --git a/scripts/install b/scripts/install
index 0fe925d0f..174d27d5a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -2,9 +2,26 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+# eliminate unwanted install flags:
+# -o and -g require root as caller which we don't want
+# -s is unwanted as we strip ourselfs if debugging is turned off
+declare -a opts
+while [[ "$1" ]]; do
+	case "$1" in
+	-o|--owner) shift ;;
+	-g|--group) shift ;;
+	-s|--strip) ;;
+	*) opts+=("$1") ;;
+	esac
+	shift
+done
+
+# prefer ginstall if available
 if [ -z "$(which ginstall 2>/dev/null)" ];then
-	/usr/bin/install "$@"
+	install=/usr/bin/install
 else
-	ginstall "$@"
+	install=ginstall
 fi
 
+# do the actual call
+exec $install "${opts[@]}"
-- 
cgit v1.2.3