From 2c61c19f80e21743ef36bc53597ba893d4836dfc Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 6 Aug 2015 04:14:20 -0400 Subject: fix non-portable `echo -n` usage These scripts use #!/bin/sh explicitly, so make sure they avoid echo -n as different shells treat it differently. Use the portable printf func instead. --- nss/db-Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'nss') diff --git a/nss/db-Makefile b/nss/db-Makefile index fc62344d60..f35bfb01c5 100644 --- a/nss/db-Makefile +++ b/nss/db-Makefile @@ -31,7 +31,7 @@ all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES))) $(VAR_DB)/passwd.db: /etc/passwd - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ /^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ @@ -41,7 +41,7 @@ $(VAR_DB)/passwd.db: /etc/passwd @echo "done." $(VAR_DB)/group.db: /etc/group - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ /^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ @@ -63,7 +63,7 @@ $(VAR_DB)/group.db: /etc/group @echo "done." $(VAR_DB)/ethers.db: /etc/ethers - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) '/^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ /^[^#]/ { printf ".%s ", $$1; print; \ @@ -72,7 +72,7 @@ $(VAR_DB)/ethers.db: /etc/ethers @echo "done." $(VAR_DB)/protocols.db: /etc/protocols - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) '/^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ /^[^#]/ { printf ".%s ", $$1; print; \ @@ -83,7 +83,7 @@ $(VAR_DB)/protocols.db: /etc/protocols @echo "done." $(VAR_DB)/rpc.db: /etc/rpc - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) '/^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ /^[^#]/ { printf ".%s ", $$1; print; \ @@ -94,7 +94,7 @@ $(VAR_DB)/rpc.db: /etc/rpc @echo "done." $(VAR_DB)/services.db: /etc/services - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS="[ \t/]+" } \ /^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ @@ -110,7 +110,7 @@ $(VAR_DB)/services.db: /etc/services @echo "done." $(VAR_DB)/shadow.db: /etc/shadow - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ /^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ @@ -130,7 +130,7 @@ $(VAR_DB)/shadow.db: /etc/shadow fi $(VAR_DB)/gshadow.db: /etc/gshadow - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ /^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ @@ -150,7 +150,7 @@ $(VAR_DB)/gshadow.db: /etc/gshadow fi $(VAR_DB)/netgroup.db: /etc/netgroup - @echo -n "$(patsubst %.db,%,$(@F))... " + @printf %s "$(patsubst %.db,%,$(@F))... " @$(AWK) 'BEGIN { ini=1 } \ /^[ \t]*$$/ { next } \ /^[ \t]*#/ { next } \ -- cgit v1.2.3