From 6600bf55782351284e2108a04438bc878e28bc5d Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 22 Nov 2016 08:02:59 -0700 Subject: [PATCH] scripts: Improve paths in update_ext_resources.sh Script was relying on $PWD for determining the current path which is unreliable in some situations. Updated to a more robust method allowing spaces in paths. Change-Id: Ibdb780c479ad7fa831d113e445cc598830806806 --- update_external_sources.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/update_external_sources.sh b/update_external_sources.sh index c20297a..a33c850 100755 --- a/update_external_sources.sh +++ b/update_external_sources.sh @@ -3,17 +3,18 @@ set -e -REVISION_DIR=$PWD/external_revisions +CURRENT_DIR="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" +REVISION_DIR="$CURRENT_DIR/external_revisions" -GLSLANG_REVISION=$(cat ${REVISION_DIR}/glslang_revision) -SPIRV_TOOLS_REVISION=$(cat "${REVISION_DIR}"/spirv-tools_revision) -SPIRV_HEADERS_REVISION=$(cat "${REVISION_DIR}"/spirv-headers_revision) +GLSLANG_REVISION=$(cat "${REVISION_DIR}/glslang_revision") +SPIRV_TOOLS_REVISION=$(cat "${REVISION_DIR}/spirv-tools_revision") +SPIRV_HEADERS_REVISION=$(cat "${REVISION_DIR}/spirv-headers_revision") echo "GLSLANG_REVISION=${GLSLANG_REVISION}" echo "SPIRV_TOOLS_REVISION=${SPIRV_TOOLS_REVISION}" echo "SPIRV_HEADERS_REVISION=${SPIRV_HEADERS_REVISION}" -BUILDDIR=$PWD -BASEDIR=$BUILDDIR/external +BUILDDIR=${CURRENT_DIR} +BASEDIR="$BUILDDIR/external" function create_glslang () { rm -rf "${BASEDIR}"/glslang -- 2.7.4