From 06c6555d4a77a5e91f43da3451586534da93e0ae Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 16 Nov 2011 18:59:01 +0700 Subject: syntax-check: fix violations and implement sc_useless_quotes_in_assignment. Contrary to popular belief, Bourne shell does not resplit RHS of assignments after expansion, so if there are no unquoted shell metacharacters or whitespace, the quotes are useless. * cfg.mk (_sc_search_regexp_or_exclude): A variation of gnulib's _sc_search_regexp that also allows individual exclusions at the site of what would otherwise match by adding a comment. (sc_useless_quotes_in_assignment): New syntax-check rule to ensure we don't reintroduce useless quoted assignments. * bootstrap, bootstrap.conf, build-aux/edit-readme-alpha, build-aux/general.m4sh, build-aux/getopt.m4sh, build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac, doc/libtool.texi, libtoolize.m4sh, m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, tests/cwrapper.at, tests/defs.m4sh, tests/lalib-syntax.at, tests/libtoolize.at, tests/lt_dlopenext.at, tests/mdemo/configure.ac, tests/mdemo2/configure.ac, tests/need_lib_prefix.at, tests/no-executables.at, tests/quote.test, tests/suffix.test: Remove spurious quotes. Signed-off-by: Gary V. Vaughan --- bootstrap.conf | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index 6f0f0c3c..c3491b5b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -77,13 +77,13 @@ gnulib_modules=' # Extra gnulib files that are not in modules, which override files of # the same name installed by other bootstrap tools. -gnulib_non_module_files="$gnulib_non_module_files"' +gnulib_non_module_files=$gnulib_non_module_files' doc/COPYINGv2 doc/fdl.texi ' # What ignore files to maintain. -vc_ignore=".gitignore" +vc_ignore=.gitignore # Running the installed `libtoolize' will trash the local (newer) libtool.m4 # among others. Don't use `:', since autoreconf can't exec it! @@ -128,10 +128,10 @@ func_reconfigure () # Also bootstrap any additional directories that were specified with # `reconfdirs' in the environment. - save_IFS="$IFS" + save_IFS=$IFS IFS=, for sub in $opt_reconf_dirs; do - IFS="$save_IFS" + IFS=$save_IFS my_autoreconf_options= $opt_copy || func_append my_autoreconf_options " --symlink" $opt_force && func_append my_autoreconf_options " --force" @@ -139,7 +139,7 @@ func_reconfigure () func_show_eval "$AUTORECONF$my_autoreconf_options --install $sub" \ 'exit $?' done - IFS="$save_IFS" + IFS=$save_IFS } @@ -164,7 +164,7 @@ libtool_options_prep () $debug_cmd # Extend the existing usage message - usage_message="$usage_message"' + usage_message=$usage_message' Libtool Specific Options: -r, --reconf-dirs=DIR1,DIR2,... limit the directories to be bootstrapped to @@ -177,7 +177,7 @@ Libtool Specific Options: # pass back the list of options we consumed func_quote_for_eval ${1+"$@"} - libtool_options_prep_result="$func_quote_for_eval_result" + libtool_options_prep_result=$func_quote_for_eval_result } func_add_hook func_options_prep libtool_options_prep @@ -192,7 +192,7 @@ libtool_parse_options () # this inner loop lets us handle `-r.' in a single iteration while test $# -gt 0; do - opt="$1" + opt=$1 shift case $opt in @@ -215,7 +215,7 @@ libtool_parse_options () # pass back the list of options we consumed func_quote_for_eval ${1+"$@"} - libtool_parse_options_result="$func_quote_for_eval_result" + libtool_parse_options_result=$func_quote_for_eval_result } func_add_hook func_parse_options libtool_parse_options @@ -231,20 +231,20 @@ libtool_validate_options () || opt_reconf_dirs=`echo $reconfdirs |$SED 's| *|,|g'` # validate $opt_reconf_dirs - save_IFS="$IFS" + save_IFS=$IFS IFS=, for reconfdir in $opt_reconf_dirs; do - IFS="$save_IFS" + IFS=$save_IFS test -d "$reconfdir" || { func_error "bad reconf directory \`$reconfdir': directory does not exist" exit_cmd=exit } done - IFS="$save_IFS" + IFS=$save_IFS # pass back the list of options we consumed func_quote_for_eval ${1+"$@"} - libtool_validate_options_result="$func_quote_for_eval_result" + libtool_validate_options_result=$func_quote_for_eval_result } func_add_hook func_validate_options libtool_validate_options @@ -302,13 +302,13 @@ libtool_build_prerequisites () func_extract_trace LT_CONFIG_LTDL_DIR - save_ifs="$IFS" + save_ifs=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_ifs" + IFS=$save_ifs shift - ltdl_dir="$1" + ltdl_dir=$1 func_check_configuration ltdl_dir \ "LT_CONFIG_LTDL_DIR([name of your libltdl directory])" func_verbose "ltdl_dir='$ltdl_dir'" @@ -421,7 +421,7 @@ libtool_cleanup_empty_dirs () { $debug_cmd - my_gnulib_source="${source_base-lib}" + my_gnulib_source=${source_base-'lib'} if test -d "$my_gnulib_source"; then rm -f "$my_gnulib_source/.gitignore" "$my_gnulib_source/Makefile.am" || exit 1 rmdir "$my_gnulib_source" || exit 1 @@ -445,13 +445,13 @@ libtool_require_package_url () func_extract_trace AC_INIT - save_IFS="$IFS" + save_IFS=$IFS IFS=: set dummy $func_extract_trace_result - IFS="$save_IFS" + IFS=$save_IFS shift - test -n "$package_url " || package_url="$5" + test -n "$package_url " || package_url=$5 test -n "$package_url" || { # How to extract the parameters for `make bootstrap-deps' from # configure.ac. This is very specific to the way Libtool's -- cgit v1.2.1