From fd01146d4c3a561eff66f125695f1d66b7eaab11 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Tue, 7 Aug 2018 14:09:32 +0200 Subject: [PATCH 1/2] gen-snmp-subdriver.sh : replace multiline "echo" with questional tabbing by a single-string "printf" --- scripts/subdriver/gen-snmp-subdriver.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/subdriver/gen-snmp-subdriver.sh b/scripts/subdriver/gen-snmp-subdriver.sh index 8ce9631f34..7d8b70041a 100755 --- a/scripts/subdriver/gen-snmp-subdriver.sh +++ b/scripts/subdriver/gen-snmp-subdriver.sh @@ -330,8 +330,7 @@ if [ -z "$NUMWALKFILE" ]; then fi # hostname is also mandatory while [ -z "$HOSTNAME" ]; do - echo " - Please enter the SNMP host IP address or name." + printf "\n\tPlease enter the SNMP host IP address or name.\n" read -p "SNMP host IP name or address: " HOSTNAME < /dev/tty if echo $HOSTNAME | egrep -q '[^a-zA-Z0-9]'; then echo "Please use only letters and digits" From c5761db00c885c2e9bfb39f2c815cbcbcc182233 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Wed, 8 Aug 2018 23:47:09 +0200 Subject: [PATCH 2/2] docs/man/Makefile.am : fix merge error that broke manpage packaging --- docs/man/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 94a16b4d9c..485e33c19b 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -177,7 +177,7 @@ SRC_DEV_PAGES = \ if WITH_MANS # NOTE: nutclient_*.3 has no source counterpart (libnutclient_*.txt) -LIBNUTCLIENT_MISC_DEPS= +LIBNUTCLIENT_MISC_DEPS= \ nutclient_authenticate.3 \ nutclient_logout.3 \ nutclient_device_login.3 \ @@ -210,7 +210,7 @@ MAN3_DEV_PAGES = \ libnutclient_misc.3 \ libnutclient_tcp.3 \ libnutclient_variables.3 \ - $(LIBNUTCLIENT_MISC_DEPS) + $(LIBNUTCLIENT_MISC_DEPS) \ nutclient_destroy.3 \ nutclient_execute_device_command.3 \ nutclient_get_device_command_description.3 \