From 189499c10bf2faccf88148e9fd9e38add9dc0873 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Sat, 16 Jul 2022 12:10:50 -0700 Subject: [PATCH] Fix shellcheck errors --- .ci/build-linux.sh | 22 +++++++++++----------- .ci/deploy-linux.sh | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 3da5ff8184..e8cb1d8fab 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -1,9 +1,9 @@ #!/bin/sh -ex # Setup Qt variables -export QT_BASE_DIR=/opt/qt${QTVERMIN} -export PATH=$QT_BASE_DIR/bin:$PATH -export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib +export QT_BASE_DIR=/opt/qt"${QTVERMIN}" +export PATH="$QT_BASE_DIR"/bin:"$PATH" +export LD_LIBRARY_PATH="$QT_BASE_DIR"/lib/x86_64-linux-gnu:"$QT_BASE_DIR"/lib if [ -z "$CIRRUS_CI" ]; then cd rpcs3 || exit 1 @@ -23,19 +23,19 @@ mkdir build && cd build || exit 1 if [ "$COMPILER" = "gcc" ]; then # These are set in the dockerfile - export CC=${GCC_BINARY} - export CXX=${GXX_BINARY} + export CC="${GCC_BINARY}" + export CXX="${GXX_BINARY}" export LINKER=gold # We need to set the following variables for LTO to link properly - export AR=/usr/bin/gcc-ar-$GCCVER - export RANLIB=/usr/bin/gcc-ranlib-$GCCVER + export AR=/usr/bin/gcc-ar-"$GCCVER" + export RANLIB=/usr/bin/gcc-ranlib-"$GCCVER" export CFLAGS="-fuse-linker-plugin" else - export CC=${CLANG_BINARY} - export CXX=${CLANGXX_BINARY} + export CC="${CLANG_BINARY}" + export CXX="${CLANGXX_BINARY}" export LINKER=lld - export AR=/usr/bin/llvm-ar-$LLVMVER - export RANLIB=/usr/bin/llvm-ranlib-$LLVMVER + export AR=/usr/bin/llvm-ar-"$LLVMVER" + export RANLIB=/usr/bin/llvm-ranlib-"$LLVMVER" fi export CFLAGS="$CFLAGS -fuse-ld=${LINKER}" diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh index c71c2b5f73..78ff06991c 100755 --- a/.ci/deploy-linux.sh +++ b/.ci/deploy-linux.sh @@ -13,7 +13,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then ls ./appdir/usr/lib/ rm -r ./appdir/usr/share/doc cp "$(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1)" ./appdir/usr/lib/libnsl.so.1 - export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH} + export PATH=/rpcs3/build/squashfs-root/usr/bin/:"${PATH}" # Embed newer libstdc++ for distros that don't come with it (ubuntu 16.04) mkdir -p appdir/usr/optional/ ; mkdir -p appdir/usr/optional/libstdc++/