taler-mdb

commit 88610a215527c2b75763f9b09b888efd401c3047
parent 4e8d54fb097ac11498d4435906281519aae392b5
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 14 Jan 2024 14:34:25 +0100

add adds to build

Diffstat:
M
contrib/Makefile.am
 | 
13
+++++++++++++
M
contrib/taler-mdb-ads.sh
 | 
4
++--
M
contrib/taler-mdb-show.sh
 | 
4
++--

3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
@@ -12,6 +12,14 @@ img_DATA = \
   err/png/child-died.png \
   err/png/maintenance.png
 
+adsdir=$(datadir)/taler/ads
+ads_DATA = \
+  ads/png/chocolate2-5s.png \
+  ads/png/chocolate-5s.png \
+  ads/png/notsnack-7s.png \
+  ads/png/swissknife-10s.png
+
+
 bin_SCRIPTS = \
   taler-mdb-ads.sh \
   taler-mdb-show.sh \
@@ -20,6 +28,11 @@ bin_SCRIPTS = \
 EXTRA_DIST = \
   $(bin_SCRIPTS) \
   $(img_DATA) \
+  $(ads_DATA) \
+  ads/svg/chocolate2-5s.svg \
+  ads/svg/chocolate-5s.svg \
+  ads/svg/notsnack-7s.svg \
+  ads/svg/swissknife-10s.svg \
   err/svg/backend-auth-failure.svg \
   err/svg/backend-no-webserver.svg \
   err/svg/backend-x509-cert-bad.svg \
diff --git a/contrib/taler-mdb-ads.sh b/contrib/taler-mdb-ads.sh
@@ -34,7 +34,7 @@ taler-mdb-display -c "$CONF"
 
 FBDEV=$(taler-config -c "$CONF" -s taler-mdb -o FRAMEBUFFER_DEVICE)
 
-DATA_HOME=$(taler-config -c "$CONF" -s paths -o TALER_DATA_HOME)
+DATA_HOME=$(taler-config -c "$CONF" -s paths -o DATADIR -f)
 
 while true
 do
@@ -42,7 +42,7 @@ do
     if [[ HOUR -ge 8 && HOUR -lt 22 ]]
     then
         taler-mdb-display -c "$CONF"
-        for AD in $(ls "${DATA_HOME}/ads/*" | shuf)
+        for AD in $(ls "${DATA_HOME}"/ads/* | shuf)
         do
             DELAY=$(echo "$AD" | awk -F'[-.]' '{print $(NF-1)}')
             fbi -d "$FBDEV" -a -m "768x576-75" -vt 2 -nocomments -noverbose "$AD"
diff --git a/contrib/taler-mdb-show.sh b/contrib/taler-mdb-show.sh
@@ -34,9 +34,9 @@ taler-mdb-display -c "$CONF"
 
 FBDEV=$(taler-config -c "$CONF" -s taler-mdb -o FRAMEBUFFER_DEVICE)
 
-DATA_HOME=$(taler-config -c "$CONF" -s paths -o TALER_DATA_HOME)
+DATA_HOME=$(taler-config -c "$CONF" -s paths -o DATADIR -f)
 
-fbi -d "$FBDEV" -a -m "768x576-75" -vt 2 -nocomments -noverbose "${DATA_HOME}/mdb/$1.png"
+fbi -d "$FBDEV" -a -m "768x576-75" -vt 2 -nocomments -noverbose "${DATA_HOME}mdb/$1.png"
 
 while true
 do