mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-28 03:49:38 +03:00
dda702fd16
Not all systems / distros have a `/bin/bash`, and these scripts are
more difficult to run at development time.
For example, my system is NixOS which doesn't have a /bin/bash. This
is not a problem for NixOS building ZFS as a package: the build
environment automatically replaces these shebangs with corrected
paths.
The problem is much more annoying at development time: either the
scripts don't run, or I correct them for my local machine and deal with
a perpetually dirty work tree.
Before committing this patch I confirmed there are existing scripts
which use `/usr/bin/env` to locate bash, so I am thinking this is a
safe transformation.
There are a handful of other shebangs in this repository which don't
work on my system. This patch is useful on its own specifically for
`commitcheck.sh`, otherwise I can't validate my commits before
submission.
Here are the remaining shebangs which NixOS systems won't have:
1274 #!/bin/ksh -p
91 #!/bin/ksh
89 #! /bin/ksh -p
2 #!/bin/sed -f
1 #!/usr/bin/perl -w
1 #!/usr/bin/ksh
1 #!/bin/nawk -f
plus this which will create an invalid shebang in
`tests/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib`:
echo "#!/bin/ksh" > $TEST_BASE_DIR/exitsZero.ksh
I chose to leave those alone for now, and gauge the interest in this
much smaller patch first.
The fixes for these are easy enough by simply using `/usr/bin/env ksh`:
91 #!/bin/ksh
1 #!/usr/bin/ksh
The fix for the other set is much trickier. Quoting the GNU coreutils
manual:
Most operating systems (e.g. GNU/Linux, BSDs) treat all text after
the first space as a single argument. When using env in a script it
is thus not possible to specify multiple arguments.
and not all `env`'s support arguments.
Mine (GNU Coreutils 8.31) does, though this feature is new since
April 2018, GNU Coreutils 8.30:
https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=668306ed86c8c79b0af0db8b9c882654ebb66db2
and worse, requires the -S argument:
-S, --split-string=S process and split S into separate arguments;
used to pass multiple arguments on shebang
lines
Example:
$ seq 1 2 | $(nix-build '<nixpkgs>' -A coreutils)/bin/env "sort -nr"
/nix/[...]-coreutils-8.31/bin/env: ‘sort -nr’: No such file or directory
/nix/[...]-coreutils-8.31/bin/env: use -[v]S to pass options in shebang lines
$ seq 1 2 | $(nix-build '<nixpkgs>' -A coreutils)/bin/env "-S sort -nr"
2
1
GNU Coreutils says FreeBSD's `env` does, though I wonder if FreeBSD's
would be unhappy with the `-S`:
https://www.gnu.org/software/coreutils/manual/html_node/env-invocation.html#env-invocation
BusyBox v1.30.1 does not, and does not have a `-S`-like option:
$ seq 1 2 | $(nix-build '<nixpkgs>' -A busybox)/bin/env "sort -nr"
env: can't execute 'sort -nr': No such file or directory
Toybox 0.8.1 also does not, and also does not have a `-S` option:
$ seq 1 2 | $(nix-build '<nixpkgs>' -A toybox)/bin/env "sort -nr"
env: exec sort -nr: No such file or directory
---
At any rate, if this patch merges and the remaining ~1,500 are updated,
the much larger patch should probably include a checkstyle-like test
asserting all new shebangs use `/usr/bin/env`. I also don't mind
dealing with NixOS weirdness if the project would prefer that.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Graham Christensen <graham@grahamc.com>
Closes #9893
211 lines
2.6 KiB
INI
211 lines
2.6 KiB
INI
#
|
|
# Copyright (c) 2016, 2019 by Delphix. All rights reserved.
|
|
# These variables are used by zfs-tests.sh to constrain which utilities
|
|
# may be used by the suite. The suite will create a directory which is
|
|
# the only element of $PATH and create symlinks from that dir to the
|
|
# binaries listed below.
|
|
#
|
|
# Please keep the contents of each variable sorted for ease of reading
|
|
# and maintenance.
|
|
#
|
|
export SYSTEM_FILES_COMMON='arp
|
|
awk
|
|
base64
|
|
basename
|
|
bc
|
|
bunzip2
|
|
bzcat
|
|
cat
|
|
chgrp
|
|
chmod
|
|
chown
|
|
cmp
|
|
cp
|
|
cpio
|
|
cut
|
|
date
|
|
dd
|
|
df
|
|
diff
|
|
dirname
|
|
dmesg
|
|
du
|
|
echo
|
|
egrep
|
|
expr
|
|
false
|
|
file
|
|
find
|
|
fio
|
|
free
|
|
getconf
|
|
getent
|
|
getfacl
|
|
grep
|
|
gunzip
|
|
gzip
|
|
head
|
|
hostname
|
|
id
|
|
iostat
|
|
kill
|
|
ksh
|
|
ln
|
|
logname
|
|
ls
|
|
mkdir
|
|
mknod
|
|
mktemp
|
|
mount
|
|
mv
|
|
net
|
|
od
|
|
openssl
|
|
pax
|
|
pgrep
|
|
ping
|
|
pkill
|
|
printenv
|
|
printf
|
|
ps
|
|
pwd
|
|
python
|
|
python2
|
|
python3
|
|
quotaon
|
|
readlink
|
|
rm
|
|
rmdir
|
|
scp
|
|
script
|
|
sed
|
|
seq
|
|
setfacl
|
|
sh
|
|
sleep
|
|
sort
|
|
ssh
|
|
stat
|
|
strings
|
|
su
|
|
sudo
|
|
sum
|
|
swapoff
|
|
swapon
|
|
sync
|
|
tail
|
|
tar
|
|
tee
|
|
timeout
|
|
touch
|
|
tr
|
|
true
|
|
truncate
|
|
umask
|
|
umount
|
|
uname
|
|
uuidgen
|
|
vmstat
|
|
wait
|
|
wc
|
|
which
|
|
xargs'
|
|
|
|
export SYSTEM_FILES_FREEBSD='chflags
|
|
compress
|
|
dumpon
|
|
fsck
|
|
getextattr
|
|
gpart
|
|
lsextattr
|
|
md5
|
|
mdconfig
|
|
mkfifo
|
|
newfs
|
|
pw
|
|
rmextattr
|
|
setextattr
|
|
sha256
|
|
swapctl
|
|
sysctl
|
|
uncompress'
|
|
|
|
export SYSTEM_FILES_LINUX='attr
|
|
bash
|
|
blkid
|
|
blockdev
|
|
chattr
|
|
cksum
|
|
dmidecode
|
|
exportfs
|
|
fallocate
|
|
fdisk
|
|
getfattr
|
|
groupadd
|
|
groupdel
|
|
groupmod
|
|
hostid
|
|
losetup
|
|
lsattr
|
|
lsblk
|
|
lscpu
|
|
lsmod
|
|
lsscsi
|
|
md5sum
|
|
mkswap
|
|
modprobe
|
|
mpstat
|
|
nproc
|
|
parted
|
|
perf
|
|
setenforce
|
|
setfattr
|
|
sha256sum
|
|
udevadm
|
|
useradd
|
|
userdel
|
|
usermod'
|
|
|
|
export ZFS_FILES='zdb
|
|
zfs
|
|
zhack
|
|
zinject
|
|
zpool
|
|
ztest
|
|
raidz_test
|
|
arc_summary
|
|
arc_summary3
|
|
arcstat
|
|
dbufstat
|
|
zed
|
|
zgenhostid
|
|
zstreamdump'
|
|
|
|
export ZFSTEST_FILES='btree_test
|
|
chg_usr_exec
|
|
devname2devid
|
|
dir_rd_update
|
|
file_check
|
|
file_trunc
|
|
file_write
|
|
get_diff
|
|
largest_file
|
|
libzfs_input_check
|
|
mkbusy
|
|
mkfile
|
|
mkfiles
|
|
mktree
|
|
mmap_exec
|
|
mmap_libaio
|
|
mmapwrite
|
|
nvlist_to_lua
|
|
randfree_file
|
|
randwritecomp
|
|
readmmap
|
|
rename_dir
|
|
rm_lnkcnt_zero_file
|
|
threadsappend
|
|
user_ns_exec
|
|
xattrtest
|
|
stride_dd'
|