5
5
6
6
# Autodect PROJECT if not set
7
7
8
- if [ x " $PROJECT " = x ]
8
+ if [ -z " $PROJECT " ]
9
9
then
10
10
case x" $JOB_NAME " in
11
11
* -community-* ) PROJECT=community;;
18
18
# If still not set, then either we are running outside Jenkins, or this
19
19
# is not a main "build" type job (it could be the bootstrap job).
20
20
# Do directory-based auto-detection.
21
- if [ x " $PROJECT " = x ]
21
+ if [ -z " $PROJECT " ]
22
22
then
23
- if [ -d $BASEDIR /nova ]
23
+ if [ -d " $BASEDIR " /nova ]
24
24
then
25
25
PROJECT=nova
26
26
else
@@ -34,7 +34,7 @@ export PROJECT
34
34
# When running manually, you can just export this variable.
35
35
# It's a flag: if it's set to 1 - then we use system OpenSSL.
36
36
# Otherwise, we build it.
37
- if [ x " $SYSTEM_SSL " = x ]
37
+ if [ -z " $SYSTEM_SSL " ]
38
38
then
39
39
# We don't bundle OpenSSL on RHEL 8 (and newer in the future)
40
40
if [ " $OS " = " rhel" ] && expr " $OS_VERSION " " >=" " 8" > /dev/null
@@ -82,7 +82,7 @@ case "$OS_FAMILY" in
82
82
esac
83
83
84
84
# When we don't bundle OpenSSL, then we need to pull it from /usr/lib64.
85
- if [ x " $SYSTEM_SSL " = x1 ]
85
+ if [ " $SYSTEM_SSL " = 1 ]
86
86
then
87
87
LDFLAGS=" $LDFLAGS -L/usr/lib64"
88
88
fi
@@ -100,7 +100,7 @@ EMBEDDED_DB="lmdb"
100
100
# ############## Fill in build dependencies in DEPS variable ################
101
101
102
102
DEPS=
103
- [ $OS_FAMILY = mingw ] && var_append DEPS " pthreads-w32 libgnurx"
103
+ [ " $OS_FAMILY " = mingw ] && var_append DEPS " pthreads-w32 libgnurx"
104
104
105
105
# libgcc_s.so is needed before we compile any other dependency
106
106
# on some platforms!
110
110
111
111
var_append DEPS " $EMBEDDED_DB pcre2"
112
112
113
- if ! [ x " $SYSTEM_SSL " = x1 ]
113
+ if ! [ " $SYSTEM_SSL " = 1 ]
114
114
then
115
115
# FIXME: Why do we need zlib?
116
116
# ANSWER: Openssl uses it optionally, TODO DISABLE
@@ -160,7 +160,7 @@ case "$EXPLICIT_ROLE" in
160
160
hub) ROLE=hub;;
161
161
* )
162
162
# Not running under Jenkins?
163
- if [ x " $JENKINS_SERVER_COOKIE " = x ]
163
+ if [ -z " $JENKINS_SERVER_COOKIE " ]
164
164
then
165
165
case " $PROJECT -$ARCH -$OS -${OS_VERSION} " in
166
166
community-* ) ROLE=agent;;
0 commit comments