summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 18:08:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 18:08:14 +0000
commitab801bd018f129b2c2f7ebe0de677728582c66f0 (patch)
tree017d87f33afadcbc15f6570abaa08c53ed4bdefd /bin
parent4d5ee2b81486df708e04a0e32ec2ea58b0e5ed5e (diff)
downloadgitlab-ce-ab801bd018f129b2c2f7ebe0de677728582c66f0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-xbin/background_jobs_sk2
-rwxr-xr-xbin/background_jobs_sk_cluster2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/background_jobs_sk b/bin/background_jobs_sk
index fb7de0a6180..0aab69126b2 100755
--- a/bin/background_jobs_sk
+++ b/bin/background_jobs_sk
@@ -36,7 +36,7 @@ start_silent()
start_sidekiq()
{
cmd="exec"
- chpst=$(which chpst)
+ chpst=$(command -v chpst)
if [ -n "$chpst" ]; then
cmd="${cmd} ${chpst} -P"
diff --git a/bin/background_jobs_sk_cluster b/bin/background_jobs_sk_cluster
index b1d5fce204e..6188ec51420 100755
--- a/bin/background_jobs_sk_cluster
+++ b/bin/background_jobs_sk_cluster
@@ -43,7 +43,7 @@ restart()
start_sidekiq()
{
cmd="exec"
- chpst=$(which chpst)
+ chpst=$(command -v chpst)
if [ -n "$chpst" ]; then
cmd="${cmd} ${chpst} -P"