From 0480cf484c9cfcee807b33d5ed4e5d2aa995650f Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 1 Jul 2020 10:49:02 -1000 Subject: [PATCH] Fix targets containing underscores Signed-off-by: Paul Spooren --- docker-imagebuilder.sh | 2 +- docker-rootfs.sh | 3 ++- docker-sdk.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-imagebuilder.sh b/docker-imagebuilder.sh index 5eeca42..68d83d3 100755 --- a/docker-imagebuilder.sh +++ b/docker-imagebuilder.sh @@ -2,7 +2,7 @@ set -ex -export TARGET="${CI_JOB_NAME##*_}" +TARGET=$(echo "$CI_JOB_NAME" | cut -d _ -f 2-) export TARGET="${TARGET:-x86-64}" export BRANCH="${BRANCH:-master}" export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-imagebuilder}" diff --git a/docker-rootfs.sh b/docker-rootfs.sh index e87da14..3e42291 100755 --- a/docker-rootfs.sh +++ b/docker-rootfs.sh @@ -2,7 +2,8 @@ set -ex -export TARGET="${CI_JOB_NAME##*_}" +TARGET=$(echo "$CI_JOB_NAME" | cut -d _ -f 2-) +export TARGET="${TARGET:-x86-64}" export BRANCH="${BRANCH:-master}" export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-rootfs}" export DOWNLOAD_FILE="openwrt-*-rootfs.tar.gz" diff --git a/docker-sdk.sh b/docker-sdk.sh index 1520b6c..d0860f5 100755 --- a/docker-sdk.sh +++ b/docker-sdk.sh @@ -2,7 +2,7 @@ set -ex -export TARGET="${CI_JOB_NAME##*_}" +TARGET=$(echo "$CI_JOB_NAME" | cut -d _ -f 2-) export TARGET="${TARGET:-x86-64}" export BRANCH="${BRANCH:-master}" export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-sdk}"