From fcb9bfbd6cb2c1db8f4994a4d078bfe2bdac3796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 15 Mar 2018 14:46:28 +0000
Subject: [PATCH] several minor fixes

---
 bootstrap.sh               |  1 +
 build-in-docker.sh         | 12 ++++++------
 scripts/bootstrap.sh       |  1 +
 scripts/build-in-docker.sh | 12 ++++++------
 scripts/template.sh        |  2 +-
 template.sh                |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index c5df053..c38ad04 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1708,6 +1708,7 @@ $(
 BuildRequires: rpm-sign, lsb-release
 %else
 BuildRequires: rpm-sign, redhat-lsb
+%global debug_package %{nil}
 %endif
 %endif
 $(
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 161351a..b341370 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -250,16 +250,16 @@ case $mode in
         done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
-            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'"
-        done
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
         for key in "${keys[@]}"; do
             wget -O- "$key" \
                 | docker exec -i ${DOCKER_ID} apt-key add -
         done
+        for repo in "${repos[@]}"; do
+            ifthenelse "${repo}" "apt-add-repository 'ARG'"
+        done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         for package in "${packages[@]}"; do
             ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 9fa1d92..fcbb128 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1708,6 +1708,7 @@ $(
 BuildRequires: rpm-sign, lsb-release
 %else
 BuildRequires: rpm-sign, redhat-lsb
+%global debug_package %{nil}
 %endif
 %endif
 $(
diff --git a/scripts/build-in-docker.sh b/scripts/build-in-docker.sh
index 161351a..b341370 100755
--- a/scripts/build-in-docker.sh
+++ b/scripts/build-in-docker.sh
@@ -250,16 +250,16 @@ case $mode in
         done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
-            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'"
-        done
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
         for key in "${keys[@]}"; do
             wget -O- "$key" \
                 | docker exec -i ${DOCKER_ID} apt-key add -
         done
+        for repo in "${repos[@]}"; do
+            ifthenelse "${repo}" "apt-add-repository 'ARG'"
+        done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         for package in "${packages[@]}"; do
             ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
diff --git a/scripts/template.sh b/scripts/template.sh
index f800880..beb656d 100755
--- a/scripts/template.sh
+++ b/scripts/template.sh
@@ -39,7 +39,7 @@ message() {
     if test $# -eq 0; then
         return
     fi
-    echo "${bold}${while}$*${normal}" 1>&2
+    echo "${bold}${white}$*${normal}" 1>&2
 }
 
 # write a success message
diff --git a/template.sh b/template.sh
index f800880..beb656d 100755
--- a/template.sh
+++ b/template.sh
@@ -39,7 +39,7 @@ message() {
     if test $# -eq 0; then
         return
     fi
-    echo "${bold}${while}$*${normal}" 1>&2
+    echo "${bold}${white}$*${normal}" 1>&2
 }
 
 # write a success message