paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell: Replace ‘which’ utility with ‘command -v’ shell builtin.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-05-03 15:00:38 -07:00
committed by Tim Abbott
parent e48c24872f
commit 9e243c74ed
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Vagrantfile vendored
View File

@@ -2,13 +2,8 @@
VAGRANTFILE_API_VERSION = "2" VAGRANTFILE_API_VERSION = "2"
def command?(name)
`which #{name} > /dev/null 2>&1`
$?.success?
end
if Vagrant::VERSION == "1.8.7" if Vagrant::VERSION == "1.8.7"
path = `which curl` path = `command -v curl`
if path.include?("/opt/vagrant/embedded/bin/curl") if path.include?("/opt/vagrant/embedded/bin/curl")
puts "In Vagrant 1.8.7, curl is broken. Please use Vagrant 2.0.2 " \ puts "In Vagrant 1.8.7, curl is broken. Please use Vagrant 2.0.2 " \
"or run 'sudo rm -f /opt/vagrant/embedded/bin/curl' to fix the " \ "or run 'sudo rm -f /opt/vagrant/embedded/bin/curl' to fix the " \

2
tools/ci/Dockerfile.template
View File

@@ -59,7 +59,7 @@ RUN set -e \
&& tar -xz -C /tmp -f /tmp/docker.tgz \ && tar -xz -C /tmp -f /tmp/docker.tgz \
&& mv /tmp/docker/* /usr/bin \ && mv /tmp/docker/* /usr/bin \
&& rm -rf /tmp/docker /tmp/docker.tgz \ && rm -rf /tmp/docker /tmp/docker.tgz \
&& which docker \ && command -v docker \
&& (docker version 2>/dev/null || true) && (docker version 2>/dev/null || true)
# ...docker-compose... # ...docker-compose...