Merge pull request #3795 from owncloud/which-to-command-v

use command -v instead of which

.bingo/Variables.mk

@@ -3,7 +3,7 @@
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
 GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
-GO     ?= $(shell which go)
+GO     ?= $(shell command -v go)
 
 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
 # will be used; reinstalling only if needed.

Makefile

@@ -55,7 +55,7 @@ PHP_CODEBEAUTIFIER=vendor-bin/php_codesniffer/vendor/bin/phpcbf
 PHAN=php -d zend.enable_gc=0 vendor-bin/phan/vendor/bin/phan
 PHPSTAN=php -d zend.enable_gc=0 vendor-bin/phpstan/vendor/bin/phpstan
 
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include .bingo/Variables.mk
 endif
 

extensions/app-provider/Makefile

@@ -4,7 +4,7 @@ NAME := app-provider
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/app-registry/Makefile

@@ -4,7 +4,7 @@ NAME := app-registry
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/audit/Makefile

@@ -4,7 +4,7 @@ NAME := audit
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/auth-basic/Makefile

@@ -4,7 +4,7 @@ NAME := auth-basic
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/auth-bearer/Makefile

@@ -4,7 +4,7 @@ NAME := auth-bearer
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/auth-machine/Makefile

@@ -4,7 +4,7 @@ NAME := auth-machine
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/frontend/Makefile

@@ -4,7 +4,7 @@ NAME := frontend
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/gateway/Makefile

@@ -4,7 +4,7 @@ NAME := gateway
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/graph-explorer/Makefile

@@ -4,7 +4,7 @@ NAME := graph-explorer
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/graph/Makefile

@@ -4,7 +4,7 @@ NAME := graph
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/groups/Makefile

@@ -4,7 +4,7 @@ NAME := groups
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/idm/Makefile

@@ -6,7 +6,7 @@ TAGS := disable_crypt
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/idp/Makefile

@@ -4,7 +4,7 @@ NAME := idp
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/nats/Makefile

@@ -4,7 +4,7 @@ NAME := nats
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/notifications/Makefile

@@ -4,7 +4,7 @@ NAME := notifications
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/ocdav/Makefile

@@ -4,7 +4,7 @@ NAME := ocdav
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/ocs/Makefile

@@ -4,7 +4,7 @@ NAME := ocs
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/proxy/Makefile

@@ -4,7 +4,7 @@ NAME := proxy
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/settings/Makefile

@@ -9,7 +9,7 @@ test-acceptance-webui:
 
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/sharing/Makefile

@@ -4,7 +4,7 @@ NAME := sharing
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/storage-publiclink/Makefile

@@ -4,7 +4,7 @@ NAME := storage-publiclink
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/storage-shares/Makefile

@@ -4,7 +4,7 @@ NAME := storage-shares
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/storage-system/Makefile

@@ -4,7 +4,7 @@ NAME := storage-system
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/storage-users/Makefile

@@ -4,7 +4,7 @@ NAME := storage-users
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/store/Makefile

@@ -4,7 +4,7 @@ NAME := store
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/thumbnails/Makefile

@@ -4,7 +4,7 @@ NAME := thumbnails
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/users/Makefile

@@ -4,7 +4,7 @@ NAME := users
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/web/Makefile

@@ -5,7 +5,7 @@ WEB_ASSETS_VERSION = v5.5.0-rc.6
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

extensions/webdav/Makefile

@@ -4,7 +4,7 @@ NAME := webdav
 include ../../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../../.bingo/Variables.mk
 endif
 

ocis-pkg/Makefile

@@ -4,7 +4,7 @@ NAME := ocis-pkg
 include ../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
 endif
 

ocis/Makefile

@@ -6,7 +6,7 @@ TAGS := disable_crypt
 include ../.make/recursion.mk
 
 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
 GOARCH := $(shell go env GOARCH)
 endif