Skip to content

Commit d3f2271

Browse files
author
vlad0x00
committed
Bash strict mode
1 parent a2e41bf commit d3f2271

File tree

13 files changed

+26
-20
lines changed

13 files changed

+26
-20
lines changed

scripts/code-coverage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ -z "${MESON_BUILD_ROOT}" ]; then
55
exit 1
66
fi
77

8-
set -e
8+
set -euo pipefail
99

1010
cd "${MESON_BUILD_ROOT}"
1111

scripts/docs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ if [ -z "${MESON_SOURCE_ROOT}" ]; then
55
exit 1
66
fi
77

8-
set -e
8+
set -euo pipefail
99

1010
cd "${MESON_SOURCE_ROOT}"
1111

12-
doxygen Doxyfile
12+
doxygen Doxyfile

scripts/get-files

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
set -e
3+
set -euo pipefail
44

55
if [ -z "${MESON_SOURCE_ROOT}" ]; then
66
echo "[ERROR] This script can only be ran with meson!"
@@ -51,4 +51,4 @@ done
5151
files=$(find ${search_dirs} -type f | grep "\(.*\.h$\)\|\(.*\.hpp$\)\|\(.*\.cpp$\)\|\(.*\.cxx$\)")
5252
for file in $files; do
5353
echo -n "$(portable_realpath $file) "
54-
done
54+
done

scripts/get-include-relative

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if [ "$#" -ne 1 ]; then
1010
exit 1
1111
fi
1212

13-
set -e
13+
set -euo pipefail
1414

1515
cd "${MESON_SOURCE_ROOT}"
1616

17-
echo -n $(dirname ${1#"${MESON_SOURCE_ROOT}/include/"})
17+
echo -n $(dirname ${1#"${MESON_SOURCE_ROOT}/include/"})

scripts/get-python-flags

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ get_libs() {
3030
echo "$libsfound"
3131
}
3232

33-
set -e
33+
set -euo pipefail
3434

3535
cd "${MESON_SOURCE_ROOT}"
3636

@@ -81,4 +81,4 @@ fi
8181

8282
echo "SUCCESS"
8383
echo "$cflags"
84-
echo "$ldflags"
84+
echo "$ldflags"

scripts/get-tests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ -z "${MESON_SOURCE_ROOT}" ]; then
55
exit 1
66
fi
77

8-
set -e
8+
set -euo pipefail
99

1010
cd "${MESON_SOURCE_ROOT}"
1111

@@ -14,4 +14,4 @@ cd "${MESON_SOURCE_ROOT}"
1414
files=$(find tests -type f | grep "\(.*\.cpp$\)\|\(.*\.cxx$\)")
1515
for file in $files; do
1616
echo -n "$(portable_realpath $file) "
17-
done
17+
done

scripts/install-cpptoml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ if [ -z "${MESON_SOURCE_ROOT}" ]; then
55
exit 1
66
fi
77

8+
set -euo pipefail
9+
810
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
911

10-
cp "${MESON_SOURCE_ROOT}/subprojects/cpptoml/include/cpptoml.h" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
12+
cp "${MESON_SOURCE_ROOT}/subprojects/cpptoml/include/cpptoml.h" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"

scripts/install-sdsl-lite

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ if [ -z "${MESON_SOURCE_ROOT}" ]; then
55
exit 1
66
fi
77

8+
set -euo pipefail
9+
810
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
911

10-
cp -r "${MESON_SOURCE_ROOT}/subprojects/sdsl-lite/include/sdsl" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
12+
cp -r "${MESON_SOURCE_ROOT}/subprojects/sdsl-lite/include/sdsl" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"

scripts/portable_realpath

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
set -euo pipefail
4+
35
# MacOS does not necessarily have coreutils installed, but Python should be as btllib requires it
46
function portable_realpath() {
57
python3 -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' $1

scripts/prepare-sdsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ -z "${MESON_SOURCE_ROOT}" ]; then
55
exit 1
66
fi
77

8-
set -e
8+
set -euo pipefail
99

1010
cd "${MESON_SOURCE_ROOT}/subprojects/sdsl-lite"
1111

@@ -30,4 +30,4 @@ rm -f CMakeLists.txt.tmp
3030
# Disable git submodule mechanism, since we're not using submodules
3131
# Currently, github does not include submodules in releases, hence this decision
3232
sed -i'.tmp' -e 's~\(.*EXECUTE_PROCESS(COMMAND\) git .*~\1 ;~' external/CMakeLists.txt
33-
rm -f external/CMakeLists.txt.tmp
33+
rm -f external/CMakeLists.txt.tmp

0 commit comments

Comments
 (0)