File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -107,7 +107,7 @@ export TEST_GPG_KEYHOME=${test_tmpdir}/gpghome
107
107
export OSTREE_GPG_HOME=${test_tmpdir} /gpghome/trusted
108
108
109
109
assert_has_setfattr () {
110
- if ! which setfattr 2> /dev/null; then
110
+ if ! command -v setfattr 2> /dev/null; then
111
111
fatal " no setfattr available to determine xattr support"
112
112
fi
113
113
}
@@ -725,9 +725,9 @@ which_gpg () {
725
725
local opt
726
726
727
727
# Prefer gpg2 in case gpg refers to gpg1
728
- if which gpg2 & > /dev/null; then
728
+ if command -v gpg2 & > /dev/null; then
729
729
gpg=gpg2
730
- elif which gpg & > /dev/null; then
730
+ elif command -v gpg & > /dev/null; then
731
731
gpg=gpg
732
732
else
733
733
# Succeed but don't return anything.
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ ostree_repo_init repo --mode=archive
34
34
35
35
mkdir files
36
36
for bin in ${bindatafiles} ; do
37
- cp $( which ${bin} ) files
37
+ cp $( command -v ${bin} ) files
38
38
done
39
39
40
40
${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ ostree_repo_init repo --mode=archive
35
35
36
36
mkdir files
37
37
for bin in ${bindatafiles} ; do
38
- cp $( which ${bin} ) files
38
+ cp $( command -v ${bin} ) files
39
39
done
40
40
41
41
${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ ostree_repo_init repo --mode=archive
33
33
34
34
mkdir files
35
35
for bin in ${bindatafiles} ; do
36
- cp $( which ${bin} ) files
36
+ cp $( command -v ${bin} ) files
37
37
done
38
38
39
39
${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files
You can’t perform that action at this time.
0 commit comments