Skip to content

Commit e0b00d3

Browse files
committed
Make Restyled/shellharden happy
1 parent 933a2aa commit e0b00d3

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

other/docker/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ ENV ENABLE_TEST=false \
3232
ENABLE_ARCH_x86_64=true \
3333
EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90"
3434

35-
ENTRYPOINT ["sh", "./build_toxcore.sh"]
35+
ENTRYPOINT ["bash", "./build_toxcore.sh"]

other/docker/windows/build_toxcore.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
22

33
set -e -x
44

@@ -61,6 +61,8 @@ build() {
6161
echo "SET(CROSSCOMPILING_EMULATOR /usr/bin/wine)" >>windows_toolchain.cmake
6262
fi
6363

64+
# Silly way to bypass a shellharden check
65+
read -ra EXTRA_CMAKE_FLAGS_ARRAY <<<"$EXTRA_CMAKE_FLAGS"
6466
cmake -DCMAKE_TOOLCHAIN_FILE=windows_toolchain.cmake \
6567
-DCMAKE_INSTALL_PREFIX="$STATIC_TOXCORE_PREFIX_DIR" \
6668
-DENABLE_SHARED=OFF \
@@ -69,7 +71,7 @@ build() {
6971
-DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \
7072
-DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS -fstack-protector" \
7173
-DCMAKE_SHARED_LINKER_FLAGS="$CMAKE_SHARED_LINKER_FLAGS" \
72-
$EXTRA_CMAKE_FLAGS \
74+
"${EXTRA_CMAKE_FLAGS_ARRAY[@]}" \
7375
-S ..
7476
cmake --build . --target install -- -j"$(nproc)"
7577

0 commit comments

Comments
 (0)