Commit 04cf0745 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'bourne_shell' into 'master'

Wrap arguments for `[ -z` in double quotes

See merge request !1071
parents 0cff6df0 59d2f6db
...@@ -10,6 +10,7 @@ v 7.3.0 ...@@ -10,6 +10,7 @@ v 7.3.0
- Support Unix domain sockets for Redis - Support Unix domain sockets for Redis
- Store session Redis keys in 'session:gitlab:' namespace - Store session Redis keys in 'session:gitlab:' namespace
- Deprecate LDAP account takeover based on partial LDAP email / GitLab username match - Deprecate LDAP account takeover based on partial LDAP email / GitLab username match
- Use /bin/sh instead of Bash in bin/web, bin/background_jobs (Pavel Novitskiy)
- Keyboard shortcuts for productivity (Robert Schilling) - Keyboard shortcuts for productivity (Robert Schilling)
- API: filter issues by state (Julien Bianchi) - API: filter issues by state (Julien Bianchi)
- API: filter issues by labels (Julien Bianchi) - API: filter issues by labels (Julien Bianchi)
......
...@@ -43,7 +43,7 @@ start_sidekiq() ...@@ -43,7 +43,7 @@ start_sidekiq()
load_ok() load_ok()
{ {
sidekiq_pid=$(cat $sidekiq_pidfile) sidekiq_pid=$(cat $sidekiq_pidfile)
if [ -z $sidekiq_pid ] ; then if [ -z "$sidekiq_pid" ] ; then
warn "Could not find a PID in $sidekiq_pidfile" warn "Could not find a PID in $sidekiq_pidfile"
exit 0 exit 0
fi fi
......
...@@ -9,7 +9,7 @@ unicorn_config="$app_root/config/unicorn.rb" ...@@ -9,7 +9,7 @@ unicorn_config="$app_root/config/unicorn.rb"
get_unicorn_pid() get_unicorn_pid()
{ {
local pid=$(cat $unicorn_pidfile) local pid=$(cat $unicorn_pidfile)
if [ -z $pid ] ; then if [ -z "$pid" ] ; then
echo "Could not find a PID in $unicorn_pidfile" echo "Could not find a PID in $unicorn_pidfile"
exit 1 exit 1
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment