Skip to content

Upstream smaller fixes from 42ity NUT #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aquette merged 2 commits into from
Aug 14, 2018
Merged

Upstream smaller fixes from 42ity NUT #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd01146
gen-snmp-subdriver.sh : replace multiline "echo" with questional tabb…
jimklimov Aug 7, 2018
c5761db
docs/man/Makefile.am : fix merge error that broke manpage packaging
jimklimov Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/man/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions scripts/subdriver/gen-snmp-subdriver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down