Skip to content

Commit 569b8c7

Browse files
MatteoPologrutoMatteoPologruto
committed
Fix issues highlighted by ShellCheck
1 parent f4cd340 commit 569b8c7

File tree

1 file changed

+35
-30
lines changed

1 file changed

+35
-30
lines changed

‎deps/build_libs.sh

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
export PREFIX=/opt/lib/${CROSS_COMPILE}
44

5-
if [ x$CROSS_COMPILER == x ]; then
5+
if [ "$CROSS_COMPILER" == "" ]; then
66
CROSS_COMPILER=${CROSS_COMPILE}-gcc
77
CROSS_COMPILER_CXX=${CROSS_COMPILE}-g++
88
# AR=${CROSS_COMPILE}-ar
@@ -13,11 +13,12 @@ CROSS_COMPILER=$CC
1313
CROSS_COMPILER_CXX=$CXX
1414
fi
1515
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}
16+
LIBUSB_DIR=$(pwd)
17+
export LIBUSB_DIR
18+
./configure --prefix="${PREFIX}" --with-pic --disable-udev --enable-static --disable-shared --host="${CROSS_COMPILE}"
1819
make distclean
19-
./configure --prefix=${PREFIX} --with-pic --disable-udev --enable-static --disable-shared --host=${CROSS_COMPILE}
20-
make -j$(nproc)
20+
./configure --prefix="${PREFIX}" --with-pic --disable-udev --enable-static --disable-shared --host="${CROSS_COMPILE}"
21+
make -j"$(nproc)"
2122
make install
2223

2324
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
@@ -27,11 +28,12 @@ if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
2728
export LIBUSB_1_0_LIBS="-L${PREFIX}/lib -lusb-1.0"
2829
fi
2930
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}
31+
LIBUSB0_DIR=$(pwd)
32+
export LIBUSB0_DIR
33+
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix="${PREFIX}" --enable-static --disable-shared --host="${CROSS_COMPILE}"
3234
make distclean
33-
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
34-
make -j$(nproc)
35+
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix="${PREFIX}" --enable-static --disable-shared --host="${CROSS_COMPILE}"
36+
make -j"$(nproc)"
3537
make install
3638

3739
cd /opt/lib/libftdi1-1.4
@@ -47,58 +49,61 @@ if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
4749
CMAKE_EXTRA_FLAG="$CMAKE_EXTRA_FLAG -DCMAKE_AR=$AR -DCMAKE_RANLIB=$RANLIB"
4850
fi
4951

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)
52+
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" ../
53+
make -j"$(nproc)"
5254
make install
5355

5456
cd /opt/lib/libelf-0.8.13
55-
export LIBELF_DIR=`pwd`
56-
./configure --disable-shared --host=$CROSS_COMPILE --prefix=${PREFIX}
57+
LIBELF_DIR=$(pwd)
58+
export LIBELF_DIR
59+
./configure --disable-shared --host="$CROSS_COMPILE" --prefix="${PREFIX}"
5760
make distclean
58-
./configure --disable-shared --host=$CROSS_COMPILE --prefix=${PREFIX}
59-
make -j$(nproc)
61+
./configure --disable-shared --host="$CROSS_COMPILE" --prefix="${PREFIX}"
62+
make -j"$(nproc)"
6063
make install
6164

6265
echo "*****************"
63-
file ${PREFIX}/lib/*
66+
file "${PREFIX}"/lib/*
6467
echo "*****************"
6568

6669
export CPPFLAGS="-P"
6770

6871
cd /opt/lib/ncurses-6.3
69-
export NCURSES_DIR=`pwd`
72+
NCURSES_DIR=$(pwd)
73+
export NCURSES_DIR
7074

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}
75+
./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}"
7276
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)
77+
./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+
make -j"$(nproc)"
7579
make install.libs
7680

7781
cd /opt/lib/readline-8.0
78-
export READLINE_DIR=`pwd`
79-
./configure --prefix=$PREFIX --disable-shared --host=$CROSS_COMPILE
82+
READLINE_DIR=$(pwd)
83+
export READLINE_DIR
84+
./configure --prefix="$PREFIX" --disable-shared --host="$CROSS_COMPILE"
8085
make distclean
81-
./configure --prefix=$PREFIX --disable-shared --host=$CROSS_COMPILE
82-
make -j$(nproc)
86+
./configure --prefix="$PREFIX" --disable-shared --host="$CROSS_COMPILE"
87+
make -j"$(nproc)"
8388
make install-static
8489

8590
if [[ $CROSS_COMPILE != "i686-w64-mingw32" && $CROSS_COMPILE != "x86_64-apple-darwin13" ]] ; then
8691
cd /opt/lib/eudev-3.2.10
8792
./autogen.sh
88-
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix=$PREFIX --host=${CROSS_COMPILE}
93+
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix="$PREFIX" --host="${CROSS_COMPILE}"
8994
make distclean
9095
./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)
96+
./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix="$PREFIX" --host="${CROSS_COMPILE}"
97+
make -j"$(nproc)"
9398
make install
9499
fi
95100

96101
cd /opt/lib/hidapi-0.12.0
97102
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
98103
./bootstrap
99-
./configure --prefix=$PREFIX --enable-static --disable-shared --host=$CROSS_COMPILE
104+
./configure --prefix="$PREFIX" --enable-static --disable-shared --host="$CROSS_COMPILE"
100105
make distclean
101106
./bootstrap
102-
./configure --prefix=$PREFIX --enable-static --disable-shared --host=$CROSS_COMPILE
103-
make -j$(nproc)
107+
./configure --prefix="$PREFIX" --enable-static --disable-shared --host="$CROSS_COMPILE"
108+
make -j"$(nproc)"
104109
make install

0 commit comments

Comments
 (0)