[git commit] applets/install: don't try to install nothing

Denys Vlasenko vda.linux at googlemail.com
Sun Apr 15 10:07:22 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=296381ff4f69715ed880adcce7d5ce608153e767
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Commit 952d5a6024e7 (applets/install: accept more than one install
option) changed the way we handle install options: before that commit, a
missing install type would mean to install nothing; after, we would
iterate over options, so we would never notice there was a mising
option.

Fix that by introducing an explicit --none option to specify to install
nothing.

Reported-by: Aaro Koskinen <aaro.koskinen at iki.fi>
Cc: Aaro Koskinen <aaro.koskinen at iki.fi>
Cc: Denys Vlasenko <vda.linux at googlemail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 Makefile.custom    | 3 +++
 applets/install.sh | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile.custom b/Makefile.custom
index 28d0ef7bc..6f679c4e1 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -11,6 +11,9 @@ busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autocon
 	$(Q)-SUID="DROP" $(SHELL) $^ > $@
 
 .PHONY: install
+ifeq ($(CONFIG_INSTALL_APPLET_DONT),y)
+INSTALL_OPTS:= --none
+endif
 ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y)
 INSTALL_OPTS:= --symlinks
 endif
diff --git a/applets/install.sh b/applets/install.sh
index c75a78e9d..9aede0f53 100755
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -5,7 +5,9 @@ export LC_CTYPE=POSIX
 
 prefix=$1
 if [ -z "$prefix" ]; then
-	echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]"
+	echo "usage: applets/install.sh DESTINATION TYPE [OPTS ...]"
+	echo "  TYPE is one of: --symlinks --hardlinks --binaries --scriptwrapper --none"
+	echo "  OPTS is one or more of: --cleanup --noclobber"
 	exit 1
 fi
 shift # Keep only remaining options
@@ -32,7 +34,7 @@ while [ ${#} -gt 0 ]; do
 		--sw-sh-sym)     scriptwrapper="y"; linkopts="-fs";;
 		--cleanup)       cleanup="1";;
 		--noclobber)     noclobber="1";;
-		"")              h="";;
+		--none)          h="";;
 		*)               echo "Unknown install option: $1"; exit 1;;
 	esac
 	shift


More information about the busybox-cvs mailing list