From b73edbf575c5c6378bb9212e5a56c6ea35d258e0 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Fri, 9 Feb 2024 09:04:09 +0100 Subject: [PATCH] scripts: remove SC2140 disable It is not needed to split the string like this: ``` a="potentially long string on"\ "multiple lines" ``` but it is better rather to put the '\' inside the string: ``` a="potentially long string on\ multiple lines" ``` --- .github/scripts/Linux/prepare.sh | 9 ++++----- .github/scripts/macOS/prepare.sh | 5 ++--- data/scripts/Linux-AppImage/AppRun | 9 ++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index b38d9b089..0eb50bc53 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -1,10 +1,9 @@ #!/bin/bash -eux -# shellcheck disable=SC2140 -printf "%b" "AJA_DIRECTORY=/var/tmp/ntv2\n"\ -"CPATH=/usr/local/qt/include\n"\ -"LIBRARY_PATH=/usr/local/qt/lib\n"\ -"PKG_CONFIG_PATH=/usr/local/qt/lib/pkgconfig\n" >> "$GITHUB_ENV" +printf "%b" "AJA_DIRECTORY=/var/tmp/ntv2\n\ +CPATH=/usr/local/qt/include\n\ +LIBRARY_PATH=/usr/local/qt/lib\n\ +PKG_CONFIG_PATH=/usr/local/qt/lib/pkgconfig\n" >> "$GITHUB_ENV" printf "/usr/local/qt/bin\n" >> "$GITHUB_PATH" git config --global user.name "UltraGrid Builder" diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 9721b36d1..a49fc83c5 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -16,10 +16,9 @@ fi export CPATH=/usr/local/include export DYLIBBUNDLER_FLAGS="${DYLIBBUNDLER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s /usr/local/lib" export LIBRARY_PATH=/usr/local/lib -# shellcheck disable=SC2140 printf "%b" \ -"CPATH=$CPATH\n"\ -"LIBRARY_PATH=$LIBRARY_PATH\n" >> "$GITHUB_ENV" +"CPATH=$CPATH\n\ +LIBRARY_PATH=$LIBRARY_PATH\n" >> "$GITHUB_ENV" echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" >> "$GITHUB_ENV" echo "/usr/local/opt/qt/bin" >> "$GITHUB_PATH" echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> "$GITHUB_ENV" diff --git a/data/scripts/Linux-AppImage/AppRun b/data/scripts/Linux-AppImage/AppRun index a773f679e..06c7eb5ce 100755 --- a/data/scripts/Linux-AppImage/AppRun +++ b/data/scripts/Linux-AppImage/AppRun @@ -273,11 +273,10 @@ if [ -n "${ULTRAGRID_USE_FIREJAIL-}" ] && [ "$ULTRAGRID_USE_FIREJAIL" != 0 ] && FIREJAIL_OPTS="${FIREJAIL_OPTS+$FIREJAIL_OPTS }--profile=$ULTRAGRID_USE_FIREJAIL" else FJ_TMPDIR=${TMPDIR-/tmp/ultragrid-$(id -u)} - # shellcheck disable=SC2140 - FIREJAIL_OPTS="${FIREJAIL_OPTS+$FIREJAIL_OPTS }--caps.drop=all"\ -" --ipc-namespace --nonewprivs --protocol=unix,inet,inet6,netlink --seccomp"\ -" --private-bin=bash --private-opt=none --mkdir=$FJ_TMPDIR"\ -" --read-write=$FJ_TMPDIR --writable-var" + FIREJAIL_OPTS="${FIREJAIL_OPTS+$FIREJAIL_OPTS }--caps.drop=all\ + --ipc-namespace --nonewprivs --protocol=unix,inet,inet6,netlink --seccomp\ + --private-bin=bash --private-opt=none --mkdir=$FJ_TMPDIR\ + --read-write=$FJ_TMPDIR --writable-var" FIREJAIL_OPTS="$FIREJAIL_OPTS $(get_custom_firejail_rules "$@") --private-etc=alsa,group,hostname,ld.so.conf,ld.so.cache,ld.so.conf.d,nsswitch.conf,passwd,resolv.conf --ignore=novideo" if ! expr "$FIREJAIL_OPTS" : '.*--read-write=/tmp ' > /dev/null; then FIREJAIL_OPTS="--read-only=/tmp $FIREJAIL_OPTS"