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>
pull/8/head
Paul Spooren 2019-07-13 10:59:25 +02:00
parent 29e08aee3d
commit 9915cb29b9
4 changed files with 12 additions and 7 deletions

View File

@ -1,7 +1,6 @@
#!/bin/bash
set -e
set -x
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"

View File

@ -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 .

View File

@ -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 .

View File

@ -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