From fbf30764a99192dfe193149ce4dc604e02c6b6be Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 29 Jun 2017 08:50:44 +0000 Subject: Fix: autobuild scripts. Wrong behavior when no DEST variable defined. mkdir failed and copy too. Now mkdir and copy happens only when DEST is defined Change-Id: I8a3701f1f0fae7ecae60195300c3d8d8db4493c7 Signed-off-by: Romain Forlot --- conf.d/app-templates | 2 +- conf.d/autobuild/agl/autobuild | 4 ++-- conf.d/autobuild/linux/autobuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'conf.d') diff --git a/conf.d/app-templates b/conf.d/app-templates index 29c5f181..a46489d2 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit 29c5f18190d6def464107ef07ec34debe40c9766 +Subproject commit a46489d23a351e0061b6d809190b30f57b990d0d diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild index dc3bdec8..31e29f7e 100755 --- a/conf.d/autobuild/agl/autobuild +++ b/conf.d/autobuild/agl/autobuild @@ -38,9 +38,9 @@ package: build @mkdir -p ${BUILD_DIR}/$@/lib @mkdir -p ${BUILD_DIR}/$@/htdocs @mkdir -p ${BUILD_DIR}/$@/data - @mkdir -p ${DEST} + @[ "${DEST}" ] && mkdir -p ${DEST} @cmake --build ${BUILD_DIR} --target widget - @cp ${BUILD_DIR}/*wgt ${DEST} + @[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST} ${BUILD_DIR}/Makefile: @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild index dc3bdec8..31e29f7e 100755 --- a/conf.d/autobuild/linux/autobuild +++ b/conf.d/autobuild/linux/autobuild @@ -38,9 +38,9 @@ package: build @mkdir -p ${BUILD_DIR}/$@/lib @mkdir -p ${BUILD_DIR}/$@/htdocs @mkdir -p ${BUILD_DIR}/$@/data - @mkdir -p ${DEST} + @[ "${DEST}" ] && mkdir -p ${DEST} @cmake --build ${BUILD_DIR} --target widget - @cp ${BUILD_DIR}/*wgt ${DEST} + @[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST} ${BUILD_DIR}/Makefile: @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} -- cgit 1.2.3-korg