Skip to content

Commit 71abcf0

Browse files
committed
configure: Fixed shellcheck issues
Signed-off-by: Lars Erik Wik <[email protected]>
1 parent bd74f5b commit 71abcf0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

build-scripts/configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh -x
22

33

4-
. `dirname "$0"`/functions
4+
. "$(dirname "$0")"/functions
55
. detect-environment
66
. compile-options
77
. version
@@ -71,7 +71,7 @@ case "$WITH_SYSTEMD" in
7171
esac
7272

7373
# RHEL 8 requires an SELinux policy
74-
if [ "x$OS" = "xrhel" ] && [ "${VER%\.*}" -gt "7" ]; then
74+
if [ "$OS" = rhel ] && [ "${VER%\.*}" -gt "7" ]; then
7575
var_append ARGS "--with-selinux-policy"
7676
fi
7777

@@ -102,21 +102,21 @@ case "$BUILD_TYPE" in
102102
;;
103103
esac
104104

105-
if [ "x$OS" = "xsolaris" ]
105+
if [ "$OS" = solaris ]
106106
then
107107
export PKG_CONFIG_PATH="$BUILDPREFIX/lib/pkgconfig"
108108
fi
109109

110110

111-
( cd $BASEDIR/core && env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS )
111+
( cd "$BASEDIR"/core && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )
112112

113-
if [ "x$NOVA" = "xyes" ]
113+
if [ "$NOVA" = yes ]
114114
then
115-
( cd $BASEDIR/enterprise && env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS )
116-
if [ "x$ROLE" = "xhub" ]
115+
( cd "$BASEDIR"/enterprise && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )
116+
if [ "$ROLE" = hub ]
117117
then
118-
( cd $BASEDIR/nova && env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS )
118+
( cd "$BASEDIR"/nova && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )
119119
fi
120120
fi
121121

122-
( cd $BASEDIR/masterfiles && env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS )
122+
( cd "$BASEDIR"/masterfiles && env "$OPTS" CFLAGS="$CFLAGS" ./configure "$ARGS" )

0 commit comments

Comments
 (0)