mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-05 20:43:08 +00:00
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.
This commit is contained in:
parent
d22e74795d
commit
841e40db54
@ -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 \
|
||||
|
@ -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
|
||||
|
12
make-dist
12
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user