[lmi-commits] [lmi] master 42d072d 11/11: Improve shell quoting

[Greg Chicares]

branch: master
commit 42d072df4ba47d6815c59c916cac531b64eba7ad
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Improve shell quoting
    
    Addressed various shellcheck diagnostics.
---
 install_msw.sh      |  2 +-
 install_wx.sh       | 14 +++++++-------
 install_wxpdfdoc.sh |  8 ++++----
 test_schemata.sh    | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/install_msw.sh b/install_msw.sh
index 513da8e..b475247 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -217,7 +217,7 @@ do
 
     find /cache_for_lmi/downloads -type f | xargs md5sum
 
-    export 
PATH=/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local/bin:/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local/lib:$minimal_path
+    export 
PATH="/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/local/bin:/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/local/lib:$minimal_path"
 
     make $coefficiency --output-sync=recurse wx_config_check
     make $coefficiency --output-sync=recurse show_flags
diff --git a/install_wx.sh b/install_wx.sh
index fba77be..2b29c00 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -49,7 +49,7 @@ LMI_TRIPLET=${LMI_TRIPLET:-"i686-w64-mingw32"}
 mingw_dir=/opt/lmi/mingw
 
 prefix=/opt/lmi/local
-exec_prefix="$prefix"/"${LMI_COMPILER}_${LMI_TRIPLET}"
+exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
 
 repo_name="wxWidgets"
 
@@ -89,7 +89,7 @@ case "$build_type" in
 esac
 
 # Distinguish wx dll by host type, compiler version, and wx SHA1.
-gcc_version=$(${mingw_bin_dir}${LMI_TRIPLET}-$LMI_COMPILER -dumpversion|tr -d 
'\r')
+gcc_version=$("${mingw_bin_dir}${LMI_TRIPLET}-$LMI_COMPILER" -dumpversion|tr 
-d '\r')
 vendor=${LMI_TRIPLET}-$gcc_version-$wx_commit_sha
 
 # Configuration reference:
@@ -135,17 +135,17 @@ config_options="
 
 [ -n "$mingw_bin_dir" ] && export PATH="$mingw_bin_dir:${PATH}"
 
-build_dir="$exec_prefix"/wx-ad_hoc/lmi-$LMI_COMPILER-$gcc_version
+build_dir="$exec_prefix/wx-ad_hoc/lmi-$LMI_COMPILER-$gcc_version"
 
 if [ "$wx_skip_clean" != 1 ]
 then
     rm --force --recursive "$build_dir"
     # This incidentally removes wxPdfDoc, but it's a good idea to rebuild that
     # whenever wx is upgraded anyway.
-    rm --force --recursive $exec_prefix/bin/wx*
-    rm --force --recursive $exec_prefix/include/wx*
-    rm --force --recursive $exec_prefix/lib/wx*
-    rm --force --recursive $exec_prefix/lib/libwx*
+    rm --force --recursive "$exec_prefix/bin/wx*"
+    rm --force --recursive "$exec_prefix/include/wx*"
+    rm --force --recursive "$exec_prefix/lib/wx*"
+    rm --force --recursive "$exec_prefix/lib/libwx*"
 fi
 
 mkdir --parents "$build_dir"
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index fd5ed6a..e43a5ff 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -49,7 +49,7 @@ LMI_TRIPLET=${LMI_TRIPLET:-"i686-w64-mingw32"}
 mingw_dir=/opt/lmi/mingw
 
 prefix=/opt/lmi/local
-exec_prefix="$prefix"/"${LMI_COMPILER}_${LMI_TRIPLET}"
+exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
 
 repo_name="wxpdfdoc"
 
@@ -105,13 +105,13 @@ config_options="
 cd "$proxy_wxpdfdoc_dir"
 autoreconf --verbose
 
-build_dir="$exec_prefix"/wxpdfdoc-ad_hoc/wxpdfdoc-$wxpdfdoc_commit_sha
+build_dir="$exec_prefix/wxpdfdoc-ad_hoc/wxpdfdoc-$wxpdfdoc_commit_sha"
 
 if [ "$wxpdfdoc_skip_clean" != 1 ]
 then
     rm --force --recursive "$build_dir"
-    rm --force --recursive $exec_prefix/lib/*wxcode*pdfdoc*
-    rm --force --recursive $exec_prefix/src/pdf*.inc
+    rm --force --recursive "$exec_prefix/lib/*wxcode*pdfdoc*"
+    rm --force --recursive "$exec_prefix/src/pdf*.inc"
 fi
 
 mkdir --parents "$build_dir"
diff --git a/test_schemata.sh b/test_schemata.sh
index 707f24f..e063eb8 100755
--- a/test_schemata.sh
+++ b/test_schemata.sh
@@ -36,11 +36,11 @@ jar_dir=/opt/lmi/third_party/rng
 
 # Data for testing.
 
-cp --preserve $srcdir/sample.cns $srcdir/sample.ill .
+cp --preserve "$srcdir"/sample.cns "$srcdir"/sample.ill .
 
 # XSL template to sort cell subelements.
 
-cp --preserve $srcdir/sort_cell_subelements.xsl .
+cp --preserve "$srcdir"/sort_cell_subelements.xsl .
 
 echo "  Test cell-subelement sorting."
 
@@ -57,7 +57,7 @@ diff --unified=0 sample.ill sorted.ill
 #
 # Only RNC is to be edited; XSD and RNG are generated from it.
 
-cp --preserve $srcdir/types.rnc $srcdir/cell.rnc 
$srcdir/multiple_cell_document.rnc $srcdir/single_cell_document.rnc .
+cp --preserve "$srcdir"/types.rnc "$srcdir"/cell.rnc 
"$srcdir"/multiple_cell_document.rnc "$srcdir"/single_cell_document.rnc .
 
 echo "  Test RNC files with 'jing'."
 
@@ -73,7 +73,7 @@ java -jar $jar_dir/jing.jar -c single_cell_document.rnc   
sample.ill
 # XSD, generated from RNG, is stored in the repository because it's
 # widely used.
 
-cp --preserve $srcdir/types.xsd $srcdir/cell.xsd 
$srcdir/multiple_cell_document.xsd $srcdir/single_cell_document.xsd .
+cp --preserve "$srcdir"/types.xsd "$srcdir"/cell.xsd 
"$srcdir"/multiple_cell_document.xsd "$srcdir"/single_cell_document.xsd .
 
 echo "  Test XSD files with 'jing'."
 
@@ -202,7 +202,7 @@ echo "  Regenerate XSD files as they should appear in the 
repository."
 # 'cell.xsd', which lacks <xs:complexType name="cell_element">, so
 # process 'multiple' before 'single'.
 
-cp --preserve $srcdir/types_*.rnc $srcdir/cell_*.rnc 
$srcdir/multiple_cell_document_*.rnc $srcdir/single_cell_document_*.rnc .
+cp --preserve "$srcdir"/types_*.rnc "$srcdir"/cell_*.rnc 
"$srcdir"/multiple_cell_document_*.rnc "$srcdir"/single_cell_document_*.rnc .
 
 java -jar $jar_dir/trang.jar multiple_cell_document.rnc    
multiple_cell_document.xsd
 java -jar $jar_dir/trang.jar single_cell_document.rnc      
single_cell_document.xsd