Skip to content

Commit 1020c2a

Browse files
committed
fix shellcheck
1 parent 2efbf9d commit 1020c2a

File tree

3 files changed

+23
-27
lines changed

3 files changed

+23
-27
lines changed

pico-blink/build.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ REPOROOT=$(git rev-parse --show-toplevel)
1010
TOOLSROOT=$REPOROOT/Tools
1111

1212
# Setup tools and build flags
13-
SWIFT_EXEC=${SWIFT_EXEC:-`xcrun -f swift`}
14-
CLANG=${CLANG:-`xcrun -f clang`}
13+
SWIFT_EXEC=${SWIFT_EXEC:-$(xcrun -f swift)}
14+
CLANG=${CLANG:-$(xcrun -f clang)}
1515
SWIFT_FLAGS="-enable-experimental-feature Embedded -disable-stack-protector"
1616
CLANG_FLAGS="-D__MACH__ -ffreestanding -mcpu=cortex-m0plus -mthumb"
1717
LD_FLAGS="-static -Wl,-e,_reset -dead_strip -Wl,-no_zero_fill_sections -Wl,-segalign,4 -Wl,-segaddr,__RESET,0x20000000 -Wl,-segaddr,__VECTORS,0x20000100 -Wl,-seg1addr,0x20000200 -Wl,-pagezero_size,0"
1818

1919
SWIFT_BUILD_FLAGS="--triple armv6m-apple-none-macho --configuration release --verbose"
2020
for SWIFT_FLAG in $SWIFT_FLAGS; do
21-
SWIFT_BUILD_FLAGS+=" -Xswiftc $SWIFT_FLAG"
21+
SWIFT_BUILD_FLAGS="$SWIFT_BUILD_FLAGS -Xswiftc $SWIFT_FLAG"
2222
done
2323

2424
for CLANG_FLAG in $CLANG_FLAGS; do
25-
SWIFT_BUILD_FLAGS+=" -Xcc $CLANG_FLAG"
25+
SWIFT_BUILD_FLAGS="$SWIFT_BUILD_FLAGS -Xcc $CLANG_FLAG"
2626
done
2727

28-
PYTHON_EXEC=${PYTHON_EXEC:-`xcrun -f python3`}
28+
PYTHON_EXEC=${PYTHON_EXEC:-$(xcrun -f python3)}
2929
MACHO2UF2=$TOOLSROOT/macho2uf2.py
3030

3131
# Build with Swift package manager
32-
$SWIFT_EXEC build $SWIFT_BUILD_FLAGS
32+
$SWIFT_EXEC build "$SWIFT_BUILD_FLAGS"
3333

3434
# Get the output directory
35-
BUILDROOT=$($SWIFT_EXEC build $SWIFT_BUILD_FLAGS --show-bin-path)
35+
BUILDROOT=$($SWIFT_EXEC build "$SWIFT_BUILD_FLAGS" --show-bin-path)
3636

3737
# Link
38-
$CLANG .build/release/Support.build/{Support.c,crt0.S}.o .build/release/Blinky.build/*.o -target armv6m-apple-none-macho -o $BUILDROOT/blinky $LD_FLAGS
38+
$CLANG .build/release/Support.build/Support.c.o .build/release/Support.build/crt0.S.o .build/release/Blinky.build/*.o -target armv6m-apple-none-macho -o "$BUILDROOT"/blinky "$LD_FLAGS"
3939

4040
# Extract sections from executable into flashable binary
41-
$PYTHON_EXEC $MACHO2UF2 --pico-family $PICO_FAMILY $BUILDROOT/blinky $BUILDROOT/blinky.uf2 --base-address 0x20000000 --segments '__TEXT,__DATA,__VECTORS,__RESET'
41+
$PYTHON_EXEC "$MACHO2UF2" --pico-family $PICO_FAMILY "$BUILDROOT"/blinky "$BUILDROOT"/blinky.uf2 --base-address 0x20000000 --segments '__TEXT,__DATA,__VECTORS,__RESET'
4242

4343
# Echo final binary path
44-
ls -al $BUILDROOT/blinky.uf2
44+
ls -al "$BUILDROOT"/blinky.uf2

stm32-blink/build.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@ set -vex
44

55
# Determine file paths
66
REPOROOT=$(git rev-parse --show-toplevel)
7-
TOOLSROOT=$REPOROOT/Tools
8-
SRCROOT=$REPOROOT/stm32-blink
9-
BUILDROOT=$SRCROOT/.build
7+
TOOLSROOT="$REPOROOT/Tools"
8+
SRCROOT="$REPOROOT/stm32-blink"
9+
BUILDROOT="$SRCROOT/.build"
1010

1111
# Setup tools and build flags
1212
TARGET=armv7-apple-none-macho
1313

14-
SWIFT_EXEC=${SWIFT_EXEC:-`xcrun -f swiftc`}
14+
SWIFT_EXEC=${SWIFT_EXEC:-$(xcrun -f swiftc)}
1515
SWIFT_FLAGS="-target $TARGET -Osize -import-bridging-header $SRCROOT/BridgingHeader.h -wmo -enable-experimental-feature Embedded -Xcc -D__APPLE__ -Xcc -D__MACH__ -Xcc -ffreestanding"
1616

17-
CLANG_EXEC=${CLANG_EXEC:-`xcrun -f clang`}
17+
CLANG_EXEC=${CLANG_EXEC:-$(xcrun -f clang)}
1818
CLANG_FLAGS="-target $TARGET -Oz"
1919

2020
LD_EXEC=${LD_EXEC:-$CLANG_EXEC}
2121
LD_FLAGS="-target $TARGET -nostdlib -static -Wl,-e,_reset -dead_strip -Wl,-no_zero_fill_sections -Wl,-segalign,4 -Wl,-segaddr,__VECTORS,0x00200000 -Wl,-seg1addr,0x00200200 -Wl,-pagezero_size,0"
2222

23-
PYTHON_EXEC=${PYTHON_EXEC:-`xcrun -f python3`}
24-
MACHO2BIN=$TOOLSROOT/macho2bin.py
23+
PYTHON_EXEC=${PYTHON_EXEC:-$(xcrun -f python3)}
24+
MACHO2BIN="$TOOLSROOT/macho2bin.py"
2525

2626
# Create build directory
27-
mkdir -p $BUILDROOT
27+
mkdir -p "$BUILDROOT"
2828

2929
# Build Swift sources
30-
$SWIFT_EXEC $SWIFT_FLAGS -c $SRCROOT/*.swift -o $BUILDROOT/blink.o
30+
"$SWIFT_EXEC" "$SWIFT_FLAGS" -c "$SRCROOT/*.swift" -o "$BUILDROOT/blink.o"
3131

3232
# Build C sources
33-
$CLANG_EXEC $CLANG_FLAGS -c $SRCROOT/Startup.c -o $BUILDROOT/Startup.o
33+
"$CLANG_EXEC" "$CLANG_FLAGS" -c "$SRCROOT/Startup.c" -o "$BUILDROOT/Startup.o"
3434

3535
# Link objects into executable
36-
$LD_EXEC $LD_FLAGS $BUILDROOT/blink.o $BUILDROOT/Startup.o -o $BUILDROOT/blink
36+
"$LD_EXEC" "$LD_FLAGS" "$BUILDROOT/blink.o" "$BUILDROOT/Startup.o" -o "$BUILDROOT/blink"
3737

3838
# Extract sections from executable into flashable binary
39-
$PYTHON_EXEC $MACHO2BIN $BUILDROOT/blink $BUILDROOT/blink.bin --base-address 0x00200000 --segments '__TEXT,__DATA,__VECTORS'
39+
"$PYTHON_EXEC" "$MACHO2BIN" "$BUILDROOT/blink" "$BUILDROOT/blink.bin" --base-address 0x00200000 --segments '__TEXT,__DATA,__VECTORS'
4040

4141
# Echo final binary path
42-
ls -al $BUILDROOT/blink.bin
42+
ls -al "$BUILDROOT/blink.bin"

stm32-lcd-logo/build.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)