aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2021-01-01 01:12:04 -0800
committerPaul Eggert2021-01-01 01:12:04 -0800
commit841e40db5458555c952257a42eaca4a51dfefdae (patch)
tree4e9fa74bc192ff3edc87c7f2ae7bf62f8082f268
parentd22e74795d8c6aeb3af64e2af8a8f3d96924f6f1 (diff)
downloademacs-841e40db5458555c952257a42eaca4a51dfefdae.tar.gz
emacs-841e40db5458555c952257a42eaca4a51dfefdae.zip
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-xadmin/merge-gnulib4
-rwxr-xr-xadmin/update-copyright4
-rwxr-xr-xmake-dist12
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
105 avoided_flags="$avoided_flags --avoid=$module" 105 avoided_flags="$avoided_flags --avoid=$module"
106done 106done
107 107
108"$gnulib_srcdir"/gnulib-tool --dir="$src" "$GNULIB_TOOL_FLAGS" \ 108"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
109 "$avoided_flags" "$GNULIB_MODULES" && 109 $avoided_flags $GNULIB_MODULES &&
110rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ 110rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
111 "$src"m4/gl-openssl.m4 \ 111 "$src"m4/gl-openssl.m4 \
112 "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \ 112 "$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) &&
53# . They are GMP files, maintained by the GMP project, with their own dates. 53# . They are GMP files, maintained by the GMP project, with their own dates.
54# . Their format cannot withstand changing the contents of copyright strings. 54# . Their format cannot withstand changing the contents of copyright strings.
55 55
56updatable_files=$(find "$repo_files" \ 56updatable_files=$(find $repo_files \
57 ! -name COPYING \ 57 ! -name COPYING \
58 ! -name doclicense.texi \ 58 ! -name doclicense.texi \
59 ! -name gpl.texi \ 59 ! -name gpl.texi \
@@ -74,4 +74,4 @@ updatable_files=$(find "$repo_files" \
74 ! -name 'mini-gmp.[ch]' \ 74 ! -name 'mini-gmp.[ch]' \
75 -print) && 75 -print) &&
76 76
77build-aux/update-copyright "$updatable_files" 77build-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
407 else 407 else
408 git ls-files | grep -v '^test' >$manifest 408 git ls-files | grep -v '^test' >$manifest
409 fi || exit 409 fi || exit
410 printf '%s\n' "$possibly_non_vc_files" "$info_files" >>$manifest || exit 410 printf '%s\n' $possibly_non_vc_files $info_files >>$manifest || exit
411 sort -u -o $manifest $manifest || exit 411 sort -u -o $manifest $manifest || exit
412fi 412fi
413 413
@@ -460,7 +460,7 @@ MANIFEST_subdir_sed='
460 s,^,'$tempdir'/, 460 s,^,'$tempdir'/,
461' 461'
462tempsubdirs=$(sed "$MANIFEST_subdir_sed" $manifest | sort -u) 462tempsubdirs=$(sed "$MANIFEST_subdir_sed" $manifest | sort -u)
463$mkdir_verbose -p "$tempsubdirs" || exit 463$mkdir_verbose -p $tempsubdirs || exit
464 464
465echo "Making links to files" 465echo "Making links to files"
466while read file; do 466while read file; do
@@ -508,13 +508,13 @@ if [ "${make_tar}" = yes ]; then
508 508
509 (cd $tempparent && 509 (cd $tempparent &&
510 case $default_gzip in 510 case $default_gzip in
511 cat) tar "$taropt" -cf - $emacsname;; 511 cat) tar $taropt -cf - $emacsname;;
512 *) if tar "$taropt" -cf /dev/null --use-compress-program="$default_gzip" \ 512 *) if tar $taropt -cf /dev/null --use-compress-program="$default_gzip" \
513 $emacsname/src/lisp.h > /dev/null 2>&1 513 $emacsname/src/lisp.h > /dev/null 2>&1
514 then 514 then
515 tar "$taropt" -cf - --use-compress-program="$default_gzip" $emacsname 515 tar $taropt -cf - --use-compress-program="$default_gzip" $emacsname
516 else 516 else
517 tar "$taropt" -cf $emacsname.tar $emacsname && 517 tar $taropt -cf $emacsname.tar $emacsname &&
518 $default_gzip <$emacsname.tar 518 $default_gzip <$emacsname.tar
519 fi;; 519 fi;;
520 esac 520 esac