aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Bolz <jbolz@nvidia.com>2018-02-14 14:26:18 -0600
committerMark Lobodzinski <mark@lunarg.com>2018-02-26 14:31:51 -0700
commit7a5d763ef4d3eb953f6b38eb46df8c0e498bdbd8 (patch)
treed6143a56ccc97a538a1c463e9bac2c856029e37b
parent6f9d8135fc502cb9b673f3de780d5bc757cf1cb4 (diff)
downloadusermoji-7a5d763ef4d3eb953f6b38eb46df8c0e498bdbd8.tar.xz
build: Fix line endings in update resources script
Used tr -d to remove line endings for external_revisions files in update_external_sources.sh script. Note: Also fixed comment Change-Id: I9a467d60acc27eeced1f48e46c3bc5624c47ab23
-rwxr-xr-xupdate_external_sources.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/update_external_sources.sh b/update_external_sources.sh
index bec3c5bb..ae16cec5 100755
--- a/update_external_sources.sh
+++ b/update_external_sources.sh
@@ -15,8 +15,9 @@ echo CORE_COUNT=$CORE_COUNT
REVISION_DIR="$CURRENT_DIR/external_revisions"
-GLSLANG_GITURL=$(cat "${REVISION_DIR}/glslang_giturl")
-GLSLANG_REVISION=$(cat "${REVISION_DIR}/glslang_revision")
+# Use tr -d to remove line endings
+GLSLANG_GITURL=$(cat "${REVISION_DIR}/glslang_giturl" | tr -d "\n\r")
+GLSLANG_REVISION=$(cat "${REVISION_DIR}/glslang_revision" | tr -d "\n\r")
echo "GLSLANG_GITURL=${GLSLANG_GITURL}"
echo "GLSLANG_REVISION=${GLSLANG_REVISION}"