From 9915cb29b9ed25e1f6fd22bb8fa1337e1550c6ee Mon Sep 17 00:00:00 2001
From: Paul Spooren <mail@aparcar.org>
Date: Sat, 13 Jul 2019 10:59:25 +0200
Subject: [PATCH] fixup: remove braces on wildcard file names

This was done to make shellcheck happy, however resulted in broken
images.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---
 docker-common.sh       | 1 -
 docker-imagebuilder.sh | 7 +++++--
 docker-rootfs.sh       | 4 ++--
 docker-sdk.sh          | 7 +++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docker-common.sh b/docker-common.sh
index d14187d..fba4904 100644
--- a/docker-common.sh
+++ b/docker-common.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 set -e
-set -x
 
 docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
 
diff --git a/docker-imagebuilder.sh b/docker-imagebuilder.sh
index 8da68df..273006b 100644
--- a/docker-imagebuilder.sh
+++ b/docker-imagebuilder.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e
+set -x
+
 TARGETS="${TARGETS:-x86-64}"
 BRANCHES="${BRANCHES:-master}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-imagebuilder}"
@@ -21,8 +24,8 @@ for TARGET in $TARGETS ; do
         sha256sum -c sha256sums_imagebuilder
 
         mkdir -p ./imagebuilder
-        tar Jxf "$IMAGEBUILDER_FILE" --strip=1 -C ./imagebuilder
-        rm -rf "$IMAGEBUILDER_FILE"
+        tar Jxf $IMAGEBUILDER_FILE --strip=1 -C ./imagebuilder
+        rm -rf $IMAGEBUILDER_FILE
 
         docker build -t "$DOCKER_IMAGE:$TARGET-$BRANCH" -f Dockerfile.imagebuilder .
 
diff --git a/docker-rootfs.sh b/docker-rootfs.sh
index 40e5c0d..d7931d0 100644
--- a/docker-rootfs.sh
+++ b/docker-rootfs.sh
@@ -22,8 +22,8 @@ for TARGET in $TARGETS ; do
         sha256sum -c sha256sums_rootfs
 
         mkdir -p ./rootfs-openwrt
-        tar xzf "$ROOTFS_FILE" -C ./rootfs-openwrt
-        rm -rf "$ROOTFS_FILE"
+        tar xzf $ROOTFS_FILE -C ./rootfs-openwrt
+        rm -rf $ROOTFS_FILE
 
         docker build -t "$DOCKER_IMAGE:$TARGET-$BRANCH" -f Dockerfile.rootfs .
 
diff --git a/docker-sdk.sh b/docker-sdk.sh
index 7574cae..8ceadbe 100644
--- a/docker-sdk.sh
+++ b/docker-sdk.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e
+set -x
+
 TARGETS="${TARGETS:-x86-64}"
 BRANCHES="${BRANCHES:-master}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-sdk}"
@@ -23,8 +26,8 @@ for TARGET in $TARGETS ; do
         sha256sum -c sha256sums_sdk
 
         mkdir -p ./sdk
-        tar Jxf "$SDK_FILE" --strip=1 -C ./sdk
-        rm -rf "$SDK_FILE"
+        tar Jxf $SDK_FILE --strip=1 -C ./sdk
+        rm -rf $SDK_FILE
 
         # use GitHub instead of git.openwrt.org
         cat > ./sdk/feeds.conf <<EOF