From b37247ac31b2365e8a7f557e7f6ee614d00628ea Mon Sep 17 00:00:00 2001 From: Pavel Novitskiy Date: Fri, 4 Jul 2014 11:45:20 +0400 Subject: change bash to sh --- bin/background_jobs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'bin/background_jobs') diff --git a/bin/background_jobs b/bin/background_jobs index c7ba4398cfb..45561eddfda 100755 --- a/bin/background_jobs +++ b/bin/background_jobs @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh cd $(dirname $0)/.. app_root=$(pwd) @@ -6,22 +6,22 @@ sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid" sidekiq_logfile="$app_root/log/sidekiq.log" gitlab_user=$(ls -l config.ru | awk '{print $3}') -function warn +warn() { echo "$@" 1>&2 } -function stop +stop() { bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1 } -function killall +killall() { pkill -u $gitlab_user -f 'sidekiq [0-9]' } -function restart +restart() { if [ -f $sidekiq_pidfile ]; then stop @@ -30,17 +30,17 @@ function restart start_sidekiq -d -L $sidekiq_logfile } -function start_no_deamonize +start_no_deamonize() { start_sidekiq } -function start_sidekiq +start_sidekiq() { bundle exec sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1 } -function load_ok +load_ok() { sidekiq_pid=$(cat $sidekiq_pidfile) if [[ -z $sidekiq_pid ]] ; then -- cgit v1.2.1 From 7dd0646e0d284050ee760c5dfa9ce69beecb9ed6 Mon Sep 17 00:00:00 2001 From: Pavel Novitskiy Date: Fri, 4 Jul 2014 15:46:44 +0400 Subject: fix bash-ism --- bin/background_jobs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/background_jobs') diff --git a/bin/background_jobs b/bin/background_jobs index 45561eddfda..b770f4e0335 100755 --- a/bin/background_jobs +++ b/bin/background_jobs @@ -43,7 +43,7 @@ start_sidekiq() load_ok() { sidekiq_pid=$(cat $sidekiq_pidfile) - if [[ -z $sidekiq_pid ]] ; then + if [ -z $sidekiq_pid ] ; then warn "Could not find a PID in $sidekiq_pidfile" exit 0 fi -- cgit v1.2.1