Skip to content

Commit 5ed3142

Browse files
authored
Fix bugs for paths with spaces in them (#83)
* Add an editorconfig for consistency * Fix for handling paths with spaces
1 parent 9219f1c commit 5ed3142

2 files changed

Lines changed: 26 additions & 13 deletions

File tree

.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# https://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
indent_style = space
7+
indent_size = 2

bin/compile

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
#!/usr/bin/env bash
22
# bin/compile <build-dir> <cache-dir>
33

4+
# Ignore the unused variable ShellCheck warning, since we are sourcing files which will use them.
5+
# shellcheck disable=SC2034
6+
47
set -e
58
set -o pipefail
69

7-
BIN_DIR=$(cd $(dirname $0); pwd)
8-
ROOT_DIR=$(dirname $BIN_DIR)
10+
BIN_DIR=$(
11+
cd $(dirname $0)
12+
pwd
13+
)
14+
ROOT_DIR=$(dirname "$BIN_DIR")
915

10-
APP_DIR=$1
11-
CACHE_DIR=$2
12-
ENV_DIR=$3
16+
APP_DIR="$1"
17+
CACHE_DIR="$2"
18+
ENV_DIR="$3"
1319

1420
VAR_PATH="$ENV_DIR/PACKAGE_DIR"
1521

@@ -30,28 +36,28 @@ source "/etc/lsb-release"
3036
source "$BIN_DIR/utils"
3137

3238
if [ -f "$BUILD_DIR/.swift-version" ]; then
33-
SWIFT_VERSION=$(cat $BUILD_DIR/.swift-version | tr -d '[[:space:]]')
39+
SWIFT_VERSION=$(cat "$BUILD_DIR/.swift-version" | tr -d '[[:space:]]')
3440
puts-step "Using Swift $SWIFT_VERSION (from package .swift-version file)"
3541
elif [ -f "$APP_DIR/.swift-version" ]; then
36-
SWIFT_VERSION=$(cat $APP_DIR/.swift-version | tr -d '[[:space:]]')
42+
SWIFT_VERSION=$(cat "$APP_DIR/.swift-version" | tr -d '[[:space:]]')
3743
puts-step "Using Swift $SWIFT_VERSION (from top-level .swift-version file)"
3844
elif [ -f "$ENV_DIR/SWIFT_VERSION" ]; then
39-
SWIFT_VERSION=`cat $ENV_DIR/SWIFT_VERSION | tr -d '[[:space:]]'`
45+
SWIFT_VERSION=$(cat "$ENV_DIR/SWIFT_VERSION" | tr -d '[[:space:]]')
4046
puts-step "Using Swift $SWIFT_VERSION (from SWIFT_VERSION config)"
4147
else
4248
puts-step "Using Swift $SWIFT_VERSION (default)"
4349
fi
4450

4551
if [ -f "$ENV_DIR/SWIFT_BUILD_CONFIGURATION" ]; then
46-
SWIFT_BUILD_CONFIGURATION=`cat "$ENV_DIR/SWIFT_BUILD_CONFIGURATION"`
52+
SWIFT_BUILD_CONFIGURATION=$(cat "$ENV_DIR/SWIFT_BUILD_CONFIGURATION")
4753
fi
4854

4955
if [ -f "$ENV_DIR/SWIFT_BUILD_FLAGS" ]; then
50-
SWIFT_BUILD_FLAGS=`cat "$ENV_DIR/SWIFT_BUILD_FLAGS"`
56+
SWIFT_BUILD_FLAGS=$(cat "$ENV_DIR/SWIFT_BUILD_FLAGS")
5157
fi
5258

5359
if [ -f "$ENV_DIR/SWIFT_DYNAMIC_STDLIB" ]; then
54-
SWIFT_DYNAMIC_STDLIB=`cat "$ENV_DIR/SWIFT_DYNAMIC_STDLIB" | tr -d '[[:space:]]'`
60+
SWIFT_DYNAMIC_STDLIB=$(cat "$ENV_DIR/SWIFT_DYNAMIC_STDLIB" | tr -d '[[:space:]]')
5561
SWIFT_BACKTRACE_EXECUTABLE="swift-backtrace"
5662
else
5763
SWIFT_BACKTRACE_EXECUTABLE="swift-backtrace-static"
@@ -60,7 +66,7 @@ fi
6066
mkdir -p "$CACHE_DIR/$STACK"
6167
source "$BIN_DIR/steps/swiftenv"
6268

63-
cd $BUILD_DIR
69+
cd "$BUILD_DIR"
6470
source "$BIN_DIR/steps/hooks/pre_compile" "$BUILD_DIR" "$CACHE_DIR" "$ENV_DIR"
6571
source "$BIN_DIR/steps/ssh"
6672
source "$BIN_DIR/steps/swift-build"
@@ -77,7 +83,7 @@ set-env() {
7783
echo "export $1=$2" >>$PROFILE_PATH
7884
}
7985

80-
mkdir -p $APP_DIR/.profile.d
86+
mkdir -p "$APP_DIR/.profile.d"
8187

8288
set-env PATH '$HOME/$APP_DIR/.swift-bin:$PATH'
8389
set-env LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$HOME/.swift-lib:$APP_DIR/.swift-lib"

0 commit comments

Comments
 (0)