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 /make-dist | |
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.
Diffstat (limited to 'make-dist')
-rwxr-xr-x | make-dist | 12 |
1 files changed, 6 insertions, 6 deletions
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 |