From a797304e4592fe1c223d2d279dcddd1d978c8202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 23 Dec 2016 14:48:20 +0000
Subject: [PATCH] bugfixes

---
 build-in-docker.sh         |  8 ++++----
 scripts/bootstrap.sh       |  6 +++---
 scripts/build-in-docker.sh | 10 ++++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build-in-docker.sh b/build-in-docker.sh
index 44fd130..7d8907c 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -10,8 +10,8 @@ mode="deb"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=("-e LANG=${LANG}" "-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
-dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg")
+envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
+dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
 packages=()
 targets="all check distcheck"
 commands=()
@@ -102,7 +102,7 @@ while test $# -gt 0; do
             targets="$1"
             if test "$1" = "deb" -o "$1" = "rpm"; then
                 # set mode to same value
-                set -- "-m" $@
+                set -- "-m" "$@"
                 continue
             fi
             ;;
@@ -246,7 +246,7 @@ case $mode in
             docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
             docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
         for repo in "${repos[@]}"; do
-            ifthenelse "${repo}" "apt-add-repository ARG"
+            ifthenelse "${repo}" "apt-add-repository 'ARG'"
         done
         for key in "${keys[@]}"; do
             wget -O- "$key" \
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index f7be988..55bdde8 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -873,9 +873,9 @@ nodejsdir = \${pkgdatadir}/nodejs
 
 sysconfdefaultdir = \${sysconfdir}/default
 sysconfinitdir = \${sysconfdir}/init
-dist_sysconf_DATA = etc/@PACKAGE_NAME@.json
-dist_sysconfdefault_DATA = etc/default/@PACKAGE_NAME@
-dist_sysconfinit_DATA = etc/init/@PACKAGE_NAME@.conf
+dist_sysconf_DATA = \${sysconfdir}/@PACKAGE_NAME@.json
+dist_sysconfdefault_DATA = \${sysconfdir}/default/@PACKAGE_NAME@
+dist_sysconfinit_DATA = \${sysconfdir}/init/@PACKAGE_NAME@.conf
 
 all: node_modules
 
diff --git a/scripts/build-in-docker.sh b/scripts/build-in-docker.sh
index 44fd130..bd4e3b6 100755
--- a/scripts/build-in-docker.sh
+++ b/scripts/build-in-docker.sh
@@ -24,6 +24,7 @@ if test -e ./build-in-docker.conf; then
     # if you do so, add the file to EXTRA_DIST in makefile.am
     source ./build-in-docker.conf
 fi
+
 while test $# -gt 0; do
     case "$1" in
         (-h|--help)
@@ -102,7 +103,7 @@ while test $# -gt 0; do
             targets="$1"
             if test "$1" = "deb" -o "$1" = "rpm"; then
                 # set mode to same value
-                set -- "-m" $@
+                set -- "-m" "$@"
                 continue
             fi
             ;;
@@ -113,6 +114,7 @@ while test $# -gt 0; do
             flags+=("$1")
             ;;
         (-r|--repo) shift;
+            echo "OPTION: $1"
             repos+=("$1")
             ;;
         (-k|--key) shift;
@@ -227,7 +229,7 @@ fi
 if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
     docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
 fi
-docker exec ${DOCKER_ID} chown -R  $(id -u).$(id -g) "${HOME}" /workdir
+docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
 case $mode in
     (deb|apt)
         if [[ "${img}" =~ "ubuntu" ]]; then
@@ -246,7 +248,7 @@ case $mode in
             docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
             docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
         for repo in "${repos[@]}"; do
-            ifthenelse "${repo}" "apt-add-repository ARG"
+            ifthenelse "${repo}" "apt-add-repository 'ARG'"
         done
         for key in "${keys[@]}"; do
             wget -O- "$key" \
@@ -284,7 +286,7 @@ EOF
         done
         for repo in "${repos[@]}"; do
             INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo true))
-            ifthenelse "${repo}" "${INSTALL_REPO} ARG"
+            ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
             ((++i))
         done
         docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh