From 8c2d617e77d7c47974da5ff8161df63bc7d5eaa0 Mon Sep 17 00:00:00 2001
From: Albert Graef <aggraef@gmail.com>
Date: Sun, 20 Sep 2020 18:24:15 +0200
Subject: [PATCH] tar_em_up.sh: Allow the path and name of the dpkg-deb tool to
be configured via the dpkg environment variable.
---
l2ork_addons/tar_em_up.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh
index 25d82f2d4..675d083e3 100755
--- a/l2ork_addons/tar_em_up.sh
+++ b/l2ork_addons/tar_em_up.sh
@@ -106,6 +106,7 @@ do case $Option in
done
inst_dir=${inst_dir:-/usr/local}
+dpkg=${dpkg:-/usr/bin/dpkg-deb}
# configure a light build if requested
if [ $light -gt 0 ]; then
@@ -156,9 +157,9 @@ fi
# Automagically disable Debian packaging when the Debian packaging tools are
# not available.
-if test $deb -gt 0 && test $pkg -gt 0 && ! test -x /usr/bin/dpkg-deb; then
+if test $deb -gt 0 && test $pkg -gt 0 && ! test -x "$dpkg"; then
pkg=0;
- echo "Debian toolchain unavailable, Debian packaging disabled"
+ echo "Debian toolchain unavailable, skipping Debian packaging"
fi
# Fetch the nw.js binary if we haven't already. We want to fetch it even
--
GitLab