diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:12:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:12:04 -0800 |
| commit | 841e40db5458555c952257a42eaca4a51dfefdae (patch) | |
| tree | 4e9fa74bc192ff3edc87c7f2ae7bf62f8082f268 | |
| parent | d22e74795d8c6aeb3af64e2af8a8f3d96924f6f1 (diff) | |
| download | emacs-841e40db5458555c952257a42eaca4a51dfefdae.tar.gz | |
Fix some mistaken shell delinting
* admin/merge-gnulib, admin/update-copyright, make-dist:
Revert recent mistaken changes that were put in merely to
pacify a shellcheck linter.
| -rwxr-xr-x | admin/merge-gnulib | 4 | ||||
| -rwxr-xr-x | admin/update-copyright | 4 | ||||
| -rwxr-xr-x | make-dist | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index ed701ce1339..880dc5eef53 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -105,8 +105,8 @@ for module in $AVOIDED_MODULES; do avoided_flags="$avoided_flags --avoid=$module" done -"$gnulib_srcdir"/gnulib-tool --dir="$src" "$GNULIB_TOOL_FLAGS" \ - "$avoided_flags" "$GNULIB_MODULES" && +"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \ + $avoided_flags $GNULIB_MODULES && rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ "$src"m4/gl-openssl.m4 \ "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \ diff --git a/admin/update-copyright b/admin/update-copyright index f392b09c10b..a70d7a3ff93 100755 --- a/admin/update-copyright +++ b/admin/update-copyright @@ -53,7 +53,7 @@ repo_files=$(git ls-files) && # . They are GMP files, maintained by the GMP project, with their own dates. # . Their format cannot withstand changing the contents of copyright strings. -updatable_files=$(find "$repo_files" \ +updatable_files=$(find $repo_files \ ! -name COPYING \ ! -name doclicense.texi \ ! -name gpl.texi \ @@ -74,4 +74,4 @@ updatable_files=$(find "$repo_files" \ ! -name 'mini-gmp.[ch]' \ -print) && -build-aux/update-copyright "$updatable_files" +build-aux/update-copyright $updatable_files diff --git a/make-dist b/make-dist index cdbc8e96844..89aa411ba94 100755 --- a/make-dist +++ b/make-dist @@ -407,7 +407,7 @@ if ( [ $update = yes ] || [ ! -f $manifest ] ) && [ -r .git ]; then else git ls-files | grep -v '^test' >$manifest fi || exit - printf '%s\n' "$possibly_non_vc_files" "$info_files" >>$manifest || exit + printf '%s\n' $possibly_non_vc_files $info_files >>$manifest || exit sort -u -o $manifest $manifest || exit fi @@ -460,7 +460,7 @@ MANIFEST_subdir_sed=' s,^,'$tempdir'/, ' tempsubdirs=$(sed "$MANIFEST_subdir_sed" $manifest | sort -u) -$mkdir_verbose -p "$tempsubdirs" || exit +$mkdir_verbose -p $tempsubdirs || exit echo "Making links to files" while read file; do @@ -508,13 +508,13 @@ if [ "${make_tar}" = yes ]; then (cd $tempparent && case $default_gzip in - cat) tar "$taropt" -cf - $emacsname;; - *) if tar "$taropt" -cf /dev/null --use-compress-program="$default_gzip" \ + cat) tar $taropt -cf - $emacsname;; + *) if tar $taropt -cf /dev/null --use-compress-program="$default_gzip" \ $emacsname/src/lisp.h > /dev/null 2>&1 then - tar "$taropt" -cf - --use-compress-program="$default_gzip" $emacsname + tar $taropt -cf - --use-compress-program="$default_gzip" $emacsname else - tar "$taropt" -cf $emacsname.tar $emacsname && + tar $taropt -cf $emacsname.tar $emacsname && $default_gzip <$emacsname.tar fi;; esac |