shellcheck: clean up shellcheck warnings and enable
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ibc843b98c0fea97a31d3d15b556a32f091bf8e47
diff --git a/u-boot-build.sh b/u-boot-build.sh
index 79f7238..c1346f9 100755
--- a/u-boot-build.sh
+++ b/u-boot-build.sh
@@ -27,8 +27,8 @@
RUN apt-get update && apt-get install -yy \
make bc gcc gcc-arm-linux-gnueabi
-RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
-RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+RUN grep -q ${GROUPS[0]} /etc/group || groupadd -g ${GROUPS[0]} ${USER}
+RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS[0]} ${USER}
USER ${USER}
ENV HOME ${HOME}
@@ -37,8 +37,7 @@
)
# Build the docker container
-docker build -t u-boot-build/ubuntu - <<< "${Dockerfile}"
-if [[ "$?" -ne 0 ]]; then
+if ! docker build -t u-boot-build/ubuntu - <<< "${Dockerfile}" ; then
echo "Failed to build docker container."
exit 1
fi
@@ -48,14 +47,14 @@
export PROXY_HOST=${PROXY_HOST/%:[0-9]*}
export PROXY_PORT=${http_proxy/#http*:\/\/*:}
-mkdir -p ${WORKSPACE}
+mkdir -p "${WORKSPACE}"
cat > "${WORKSPACE}"/build.sh << EOF_SCRIPT
#!/bin/bash
set -x
-cd ${WORKSPACE}
+cd "${WORKSPACE}"
gcc --version
arm-linux-gnueabi-gcc --version
@@ -67,8 +66,9 @@
EOF_SCRIPT
-chmod a+x ${WORKSPACE}/build.sh
+chmod a+x "${WORKSPACE}"/build.sh
# Run the docker container, execute the build script we just built
-docker run --rm=true -e WORKSPACE=${WORKSPACE} --user="${USER}" \
- -w "${HOME}" -v "${HOME}":"${HOME}" -t u-boot-build/ubuntu ${WORKSPACE}/build.sh
+docker run --rm=true -e WORKSPACE="${WORKSPACE}" --user="${USER}" \
+ -w "${HOME}" -v "${HOME}":"${HOME}" -t u-boot-build/ubuntu \
+ "${WORKSPACE}"/build.sh