8000 Fix issues highlighted by ShellCheck · arduino/crossbuild@d1313d1 · GitHub
[go: up one dir, main page]
Skip to content

Commit d1313d1

Browse files
MatteoPologrutoMatteoPologruto
committed
Fix issues highlighted by ShellCheck
1 parent daf4fa8 commit d1313d1

File tree

1 file changed

+38
-30
lines changed

1 file changed

+38
-30
lines changed

‎deps/build_libs.sh

Lines changed: 38 additions & 30 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
#!/bin/bash -ex
22

3+
true # Dummy command required to prevent first ShellCheck directive from having global scope.
4+
5+
# shellcheck disable=SC2153 # Fix false positive of ShellCheck rule SC2153.
36
export PREFIX=/opt/lib/${CROSS_COMPILE}
47

5-
if [ x$CROSS_COMPILER == x ]; then
8+
if [ "$CROSS_COMPILER" == "" ]; then
69
CROSS_COMPILER=${CROSS_COMPILE}-gcc
710
CROSS_COMPILER_CXX=${CROSS_COMPILE}-g++
811
# AR=${CROSS_COMPILE}-ar
@@ -13,11 +16,12 @@ CROSS_COMPILER=$CC
1316
CROSS_COMPILER_CXX=$CXX
1417
fi
1518
cd /opt/lib/libusb-1.0.26
16-
export LIBUSB_DIR=`pwd`
17-
./configure --prefix=${PREFIX} --with-pic --disable-udev --enable-static --disable-shared --host=${CROSS_COMPILE}
19+
LIBUSB_DIR=$(pwd)
20+
export LIBUSB_DIR
21+
./configure --prefix="${PREFIX}" --with-pic --disable-udev --enable-static --disable-shared --host="${CROSS_COMPILE}"
1822
make distclean
19-
./configure --prefix=${PREFIX} --with-pic --disable-udev --enable-static --disable-shared --host=${CROSS_COMPILE}
20-
make -j$(nproc)
23+
./configure --prefix="${PREFIX}" --with-pic --disable-udev --enable-static --disable-shared --host="${CROSS_COMPILE}"
24+
make -j"$(nproc)"
2125
make install
2226

2327
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
@@ -27,11 +31,12 @@ if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
2731
export LIBUSB_1_0_LIBS="-L${PREFIX}/lib -lusb-1.0"
2832
fi
2933
cd /opt/lib/libusb-compat-0.1.7
30-
export LIBUSB0_DIR=`pwd`
31-
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
34+
LIBUSB0_DIR=$(pwd)
35+
export LIBUSB0_DIR
36+
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix="${PREFIX}" --enable-static --disable-shared --host="${CROSS_COMPILE}"
3237
make distclean
33-
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
34-
make -j$(nproc)
38+
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix="${PREFIX}" --enable-static --disable-shared --host="${CROSS_COMPILE}"
39+
make -j"$(nproc)"
3540
make install
3641

3742
cd /opt/lib/libftdi1-1.4
@@ -47,58 +52,61 @@ if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
4752
CMAKE_EXTRA_FLAG="$CMAKE_EXTRA_FLAG -DCMAKE_AR=$AR -DCMAKE_RANLIB=$RANLIB"
4853
fi
4954

50-
cmake -DCMAKE_C_COMPILER=$CROSS_COMPILER -DCMAKE_CXX_COMPILER=$CROSS_COMPILER_CXX -DCMAKE_INSTALL_PREFIX="$PREFIX" $CMAKE_EXTRA_FLAG -DLIBUSB_INCLUDE_DIR="$PREFIX/include/libusb-1.0" -DLIBFTDI_LIBRARY_DIRS="$PREFIX/lib" -DLIBUSB_LIBRARIES="usb-1.0" ../
51-
make -j$(nproc)
55+
cmake -DCMAKE_C_COMPILER="$CROSS_COMPILER" -DCMAKE_CXX_COMPILER="$CROSS_COMPILER_CXX" -DCMAKE_INSTALL_PREFIX="$PREFIX" "$CMAKE_EXTRA_FLAG" -DLIBUSB_INCLUDE_DIR="$PREFIX/include/libusb-1.0" -DLIBFTDI_LIBRARY_DIRS="$PREFIX/lib" -DLIBUSB_LIBRARIES="usb-1.0" ../
56+
make -j"$(nproc)"
5257
make install
5358

5459
cd /opt/lib/libelf-0.8.13
55-
export LIBELF_DIR=`pwd`
56-
./configure --disable-shared --host=$CROSS_COMPILE --prefix=${PREFIX}
60+
LIBELF_DIR=$(pwd)
61+
export LIBELF_DIR
62+
./configure --disable-shared --host="$CROSS_COMPILE" --prefix="${PREFIX}"
5763
make distclean
58-
./configure --disable-shared --host=$CROSS_COMPILE --prefix=${PREFIX}
59-
make -j$(nproc)
64+
./configure --disable-shared --host="$CROSS_COMPILE" --prefix="${PREFIX}"
65+
make -j"$(nproc)"
6066
make install
6167

6268
echo "*****************"
63-
file ${PREFIX}/lib/*
69+
file "${PREFIX}"/lib/*
6470
echo "*****************"
6571

6672
export CPPFLAGS="-P"
6773

6874
cd /opt/lib/ncurses-6.3
69-
export NCURSES_DIR=`pwd`
75+
NCURSES_DIR=$(pwd)
76+
export NCURSES_DIR
7077

71-
./configure $EXTRAFLAGS --target=$CROSS_COMPILE --without-pthread --enable-database --enable-sp-funcs --enable-term-driver --without-shared --without-debug --without-ada --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
78+
./configure "$EXTRAFLAGS" --target="$CROSS_COMPILE" --without-pthread --enable-database --enable-sp-funcs --enable-term-driver --without-shared --without-debug --without-ada --enable-termcap --without-manpages --without-progs --without-tests --host="$CROSS_COMPILE" --prefix="${PREFIX}"
7279
make distclean
73-
./configure $EXTRAFLAGS --target=$CROSS_COMPILE --without-pthread --enable-database --enable-sp-funcs --enable-term-driver --without-shared --without-debug --without-ada --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
74-
make -j$(nproc)
80+
./configure "$EXTRAFLAGS" --target="$CROSS_COMPILE" --without-pthread --enable-database --enable-sp-funcs --enable-term-driver --without-shared --without-debug --without-ada --enable-termcap --without-manpages --without-progs --without-tests --host="$CROSS_COMPILE" --prefix="${PREFIX}"
81+
make -j"$(nproc)"
7582
make install.libs
7683

7784
cd /opt/lib/readline-8.0
78-
export READLINE_DIR=`pwd`
79-
./configure --prefix=$PREFIX --disable-shared --host=$CROSS_COMPILE
85+
READLINE_DIR=$(pwd)
86+
export READLINE_DIR
87+
./configure --prefix="$PREFIX" --disable-shared --host="$CROSS_COMPILE"
8088
make distclean
81-
./configure --prefix=$PREFIX --disable-shared --host=$CROSS_COMPILE
82-
make -j$(nproc)
89+
./configure --prefix="$PREFIX" --disable-shared --host="$CROSS_COMPILE"
90+
make -j"$(nproc)"
8391
make install-static
8492

8593
if [[ $CROSS_COMPILE != "i686-w64-mingw32" && $CROSS_COMPILE != "x86_64-apple-darwin13" ]] ; then
8694
cd /opt/lib/eudev-3.2.10
8795
./autogen.sh
88-
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix=$PREFIX --host=${CROSS_COMPILE}
96+
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix="$PREFIX" --host="${CROSS_COMPILE}"
8997
make distclean
9098
./autogen.sh
91-
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix=$PREFIX --host=${CROSS_COMPILE}
92-
make -j$(nproc)
99+
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix="$PREFIX" --host="${CROSS_COMPILE}"
100+
make -j"$(nproc)"
93101
make install
94102
fi
95103

96104
cd /opt/lib/hidapi-0.12.0
97105
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
98106
./bootstrap
99-
./configure --prefix=$PREFIX --enable-static --disable-shared --host=$CROSS_COMPILE
107+
./configure --prefix="$PREFIX" --enable-static --disable-shared --host="$CROSS_COMPILE"
100108
make distclean
101109
./bootstrap
102-
./configure --prefix=$PREFIX --enable-static --disable-shared --host=$CROSS_COMPILE
103-
make -j$(nproc)
110+
./configure --prefix="$PREFIX" --enable-static --disable-shared --host="$CROSS_COMPILE"
111+
make -j"$(nproc)"
104112
make install

0 commit comments

Comments
 (0)
0