Skip to content

Commit 830b741

Browse files
Fix shellcheck violations (#16221)
1 parent cfd5972 commit 830b741

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

etc/win-ci/build-iconv.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Run-InDirectory $BuildTree {
1616
$env:CHERE_INVOKING = 1
1717
[System.IO.File]::WriteAllText("src\Makefile.in", [System.IO.File]::ReadAllText("src\Makefile.in").Replace("chmod 777 .", "true"))
1818

19-
& 'C:\cygwin64\bin\bash.exe' --login "$PSScriptRoot\cygwin-build-iconv.sh" "$Version" "$(if ($Dynamic) { 1 })"
19+
& 'C:\cygwin64\bin\bash.exe' --login "$PSScriptRoot\cygwin-build-iconv.sh" "$(if ($Dynamic) { 1 })"
2020
if (-not $?) {
2121
Write-Host "Error: Failed to build libiconv" -ForegroundColor Red
2222
Exit 1

etc/win-ci/cygwin-build-iconv.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/sh
2+
# shellcheck disable=SC2155
23

3-
set -eo pipefail
4+
set -e
45

5-
Version=$1
6-
Dynamic=$2
6+
Dynamic=$1
77

88
export PATH="$(pwd)/build-aux:$PATH"
99
export CC="$(pwd)/build-aux/compile cl -nologo"
@@ -26,7 +26,7 @@ else
2626
# GNU libiconv appears to define `BUILDING_DLL` unconditionally, so the static
2727
# library contains `/EXPORT` directives that make any executable also export
2828
# the iconv symbols, which we don't want
29-
find . '(' -name '*.h' -or -name '*.h.build.in' ')' -print0 | xargs -0 -i sed -i 's/__declspec(dllexport)//' '{}'
29+
find . '(' -name '*.h' -or -name '*.h.build.in' ')' -print0 | xargs -0 -I{} sed -i 's/__declspec(dllexport)//' '{}'
3030
fi
3131
export CPPFLAGS="-O2 -D_WIN32_WINNT=_WIN32_WINNT_WIN7 -I$(pwd)/iconv/include"
3232
export LDFLAGS="-L$(pwd)/iconv/lib"

spec/llvm-ir/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SCRIPT_PATH="$(realpath "$0")"
99
SCRIPT_ROOT="$(dirname "$SCRIPT_PATH")"
1010

1111
BUILD_DIR=$SCRIPT_ROOT/../../.build
12-
LLVM_CONFIG="$(basename $("$SCRIPT_ROOT"/../../src/llvm/ext/find-llvm-config.sh))"
12+
LLVM_CONFIG="$(basename "$("$SCRIPT_ROOT"/../../src/llvm/ext/find-llvm-config.sh)")"
1313
FILE_CHECK=FileCheck-"${LLVM_CONFIG#llvm-config-}"
1414
crystal=${CRYSTAL_SPEC_COMPILER_BIN:-$SCRIPT_ROOT/../../bin/crystal}
1515

0 commit comments

Comments
 (0)