From a72ffafb8f38f5516863e0130adb5010ffccc77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= Date: Wed, 16 Mar 2022 17:51:07 +0100 Subject: [PATCH] Have to use g prefix for gnu tools also on *BSD --- scripts/astyle.sh | 2 +- scripts/customwidget_create.sh | 4 ++-- scripts/prepare_commit.sh | 4 ++-- scripts/qstringfixup.sh | 4 ++-- scripts/rename_cpp.sh | 4 ++-- scripts/sip_include.sh | 4 ++-- scripts/sipify_all.sh | 4 ++-- scripts/spell_check/check_spelling.sh | 4 ++-- scripts/spell_check/test.sh | 4 ++-- tests/code_layout/sipify/test_sipfiles.sh | 4 ++-- tests/code_layout/test_settings_registry.sh | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/astyle.sh b/scripts/astyle.sh index 34accdc1810..cd52dd7d419 100755 --- a/scripts/astyle.sh +++ b/scripts/astyle.sh @@ -16,7 +16,7 @@ # sort by version option SV=V -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then SV=n fi diff --git a/scripts/customwidget_create.sh b/scripts/customwidget_create.sh index 11d55a88548..c6244105c5c 100755 --- a/scripts/customwidget_create.sh +++ b/scripts/customwidget_create.sh @@ -9,9 +9,9 @@ set -e -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/scripts/prepare_commit.sh b/scripts/prepare_commit.sh index b67d1c0945c..b1f6b111a5f 100755 --- a/scripts/prepare_commit.sh +++ b/scripts/prepare_commit.sh @@ -24,9 +24,9 @@ fi cd "$TOPLEVEL" -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/scripts/qstringfixup.sh b/scripts/qstringfixup.sh index 8fd16899650..032d4157601 100755 --- a/scripts/qstringfixup.sh +++ b/scripts/qstringfixup.sh @@ -30,9 +30,9 @@ TOPLEVEL=$(git rev-parse --show-toplevel) cd "$TOPLEVEL" || exit -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/scripts/rename_cpp.sh b/scripts/rename_cpp.sh index f10014b4769..72876a6b1f9 100755 --- a/scripts/rename_cpp.sh +++ b/scripts/rename_cpp.sh @@ -7,9 +7,9 @@ set -e -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/scripts/sip_include.sh b/scripts/sip_include.sh index 1b6477cd4a8..1f201bbfbeb 100755 --- a/scripts/sip_include.sh +++ b/scripts/sip_include.sh @@ -25,9 +25,9 @@ DIR=$(git rev-parse --show-toplevel) pushd ${DIR} > /dev/null -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/scripts/sipify_all.sh b/scripts/sipify_all.sh index ea2757f9d6d..5704d76bd9b 100755 --- a/scripts/sipify_all.sh +++ b/scripts/sipify_all.sh @@ -27,9 +27,9 @@ set -e DIR=$(git rev-parse --show-toplevel) -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/scripts/spell_check/check_spelling.sh b/scripts/spell_check/check_spelling.sh index b5624f70d5b..beda883422a 100755 --- a/scripts/spell_check/check_spelling.sh +++ b/scripts/spell_check/check_spelling.sh @@ -32,9 +32,9 @@ DIR=$(git rev-parse --show-toplevel)/scripts/spell_check AGIGNORE=${DIR}/.agignore -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/scripts/spell_check/test.sh b/scripts/spell_check/test.sh index 50e4fa6d37d..58ccd3c78df 100755 --- a/scripts/spell_check/test.sh +++ b/scripts/spell_check/test.sh @@ -16,9 +16,9 @@ # Testing the spell test :) -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/tests/code_layout/sipify/test_sipfiles.sh b/tests/code_layout/sipify/test_sipfiles.sh index fed7bfcf15a..c013ed32c62 100755 --- a/tests/code_layout/sipify/test_sipfiles.sh +++ b/tests/code_layout/sipify/test_sipfiles.sh @@ -6,9 +6,9 @@ srcdir=$(dirname $0)/../../ DIR=$(git -C ${srcdir} rev-parse --show-toplevel) -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi diff --git a/tests/code_layout/test_settings_registry.sh b/tests/code_layout/test_settings_registry.sh index 265c886e37e..1fef52025c8 100755 --- a/tests/code_layout/test_settings_registry.sh +++ b/tests/code_layout/test_settings_registry.sh @@ -2,9 +2,9 @@ set -e -# GNU prefix command for mac os support (gsed, gsplit) +# GNU prefix command for bsd/mac os support (gsed, gsplit) GP= -if [[ "$OSTYPE" =~ darwin* ]]; then +if [[ "$OSTYPE" == *bsd* ]] || [[ "$OSTYPE" =~ darwin* ]]; then GP=g fi