[PATCH] D36064: [docker] Fix unmatched quote problem in here-document on older versions of bash

don hinton via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Jul 31 07:10:28 PDT 2017


hintonda updated this revision to Diff 108920.
hintonda added a comment.

- Apply here-document fix to all scripts for consistency.


https://reviews.llvm.org/D36064

Files:
  utils/docker/build_docker_image.sh
  utils/docker/scripts/build_install_llvm.sh


Index: utils/docker/scripts/build_install_llvm.sh
===================================================================
--- utils/docker/scripts/build_install_llvm.sh
+++ utils/docker/scripts/build_install_llvm.sh
@@ -11,7 +11,7 @@
 set -e
 
 function show_usage() {
-  usage=$(cat << EOF
+  cat << EOF
 Usage: build_install_llvm.sh [options] -- [cmake-args]
 
 Checkout svn sources and run cmake with the specified arguments. Used
@@ -37,8 +37,6 @@
 
 All options after '--' are passed to CMake invocation.
 EOF
-)
-  echo "$usage"
 }
 
 LLVM_SVN_REV=""
Index: utils/docker/build_docker_image.sh
===================================================================
--- utils/docker/build_docker_image.sh
+++ utils/docker/build_docker_image.sh
@@ -15,7 +15,7 @@
 BUILDSCRIPT_ARGS=""
 
 function show_usage() {
-  usage=$(cat << EOF
+  cat << EOF
 Usage: build_docker_image.sh [options] [-- [cmake_args]...]
 
 Available options:
@@ -64,8 +64,6 @@
     -DCLANG_ENABLE_BOOTSTRAP=ON \ 
     -DCLANG_BOOTSTRAP_TARGETS="install-clang;install-clang-headers"
 EOF
-)
-  echo "$usage"
 }
 
 SEEN_INSTALL_TARGET=0


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36064.108920.patch
Type: text/x-patch
Size: 1102 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170731/cb209c1b/attachment.bin>


More information about the llvm-commits mailing list