taler-mdb

commit 7e851ec5e6f21a41d605ec919a26865a6081bfd8
parent b31d2af5910632ac5d845df24abfe278d50bdf6f
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 13 Jan 2024 21:21:20 +0100

build fixes

Diffstat:
M
contrib/Makefile.am
 | 
7
++++---
M
contrib/taler-mdb-network-check.sh
 | 
16
+++++++---------
M
src/Makefile.am
 | 
5
++---

3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = .
 
 imgdir=$(datadir)/taler/mdb
-imgdir_DATA = \
+img_DATA = \
   png/backend-auth-failure.png \
   png/backend-no-webserver.png \
   png/backend-x509-cert-bad.png \
@@ -10,14 +10,15 @@ imgdir_DATA = \
   png/backend-dns-resolution-failure.png \
   png/backend-unreachable.png \
   png/child-died.png \
-  png/maintenance.png 
+  png/maintenance.png
 
 bin_SCRIPTS = \
+  taler-mdb-show.sh \
   taler-mdb-network-check.sh
 
 EXTRA_DIST = \
   $(bin_SCRIPTS) \
-  $(imgdir_DATA) \
+  $(img_DATA) \
   svg/backend-auth-failure.svg \
   svg/backend-no-webserver.svg \
   svg/backend-x509-cert-bad.svg \
diff --git a/contrib/taler-mdb-network-check.sh b/contrib/taler-mdb-network-check.sh
@@ -63,11 +63,6 @@ while getopts ':c:f:h' OPTION; do
 done
 shift $((OPTIND - 1))
 
-if [[ "${BACKEND_HOSTNAME:-}" == "" ]]
-then
-    exit_fail "Specifying '-t' is required"
-fi
-
 dig -h > /dev/null || exit_fail "'dig' is required"
 
 
@@ -100,9 +95,12 @@ function show_failure()
 # Function to run when our child died.
 function childdeath()
 {
-    wait ${CHILD_PID}
-    CHILD_PID="-1"
-    show_failure child-died
+    if [ "$CHILD_PID" != "-1" ]
+    then
+        wait ${CHILD_PID}
+        CHILD_PID="-1"
+        show_failure child-died
+    fi
 }
 
 # Install cleanup handler (except for kill -9)
@@ -115,7 +113,7 @@ function check_network()
     DEF_BACKEND=$(taler-config -c "$CONF" -s "taler-mdb" -o "BACKEND_BASE_URL")
     BACKEND_HOSTNAME=$(echo "$DEF_BACKEND" | awk -F/ '{print $3}')
 
-    DNS_HOST=$(grep nameserver /etc/resolv.conf | awk '{print $2}')
+    DNS_HOST=$(grep nameserver /etc/resolv.conf | grep -v '^#' | head -n1 | awk '{print $2}')
     if ! ping -c1 "$DNS_HOST" &> /dev/null
     then
         show_failure no-ip
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -45,9 +45,8 @@ qr_show_LDADD = \
   $(XLIB)
 
 
-taler-mdb-display_SOURCES = \
+taler_mdb_display_SOURCES = \
   taler-mdb-display.c
-taler-mdb-display_LDADD = \
+taler_mdb_display_LDADD = \
   -lgnunetutil \
   $(XLIB)
-