From 967cf9df004aba4b883a2d35a01e159e10c3489c Mon Sep 17 00:00:00 2001 From: Jernej Jakob Date: Thu, 9 Apr 2020 05:53:34 +0000 Subject: T2250: make build_dir a relative path --- scripts/build-qemu-image | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts/build-qemu-image') diff --git a/scripts/build-qemu-image b/scripts/build-qemu-image index 29cb6cf1..7687db36 100755 --- a/scripts/build-qemu-image +++ b/scripts/build-qemu-image @@ -18,16 +18,16 @@ # Purpose: # Build VyOS raw image for qemu. -BUILD_DIR=$(scripts/query-json build/build-config.json build_dir) -BUILD_ARCH=$(scripts/query-json build/build-config.json architecture) -export VERSION=$(cat $BUILD_DIR/version) +BUILD_DIR="$(scripts/query-json build/build-config.json build_dir)" +BUILD_ARCH="$(scripts/query-json build/build-config.json architecture)" +export VERSION="$(cat $BUILD_DIR/version)" -export ISO_IMAGE=./build/live-image-$BUILD_ARCH.hybrid.iso -export ISO_MD5_SUM=$(md5sum ${ISO_IMAGE} | awk '{print $1}') +export ISO_IMAGE="${BUILD_DIR}/live-image-$BUILD_ARCH.hybrid.iso" +export ISO_MD5_SUM="$(md5sum ${ISO_IMAGE} | awk '{print $1}')" export PACKER_BUILD_DIR=packer_build -export PACKER_LOG_PATH=${PACKER_BUILD_DIR}/build.log +export PACKER_LOG_PATH="${PACKER_BUILD_DIR}/build.log" export PACKER_LOG=1 -mkdir -p ${PACKER_BUILD_DIR} +mkdir -p "${PACKER_BUILD_DIR}" packer build -only=qemu-image scripts/packer.json -- cgit v1.2.3