Skip to content

Commit dcdcfd3

Browse files
samaaronsamaaron
committed
Build - quote paths to properly handle spaces
1 parent 5d41059 commit dcdcfd3

File tree

11 files changed

+55
-54
lines changed

11 files changed

+55
-54
lines changed

‎app/external/mac_build_externals.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ echo "Building external deps..."
1313
cmake --build . --config Release
1414

1515
cd "${SCRIPT_DIR}"
16+
echo "Completed building external deps."

‎app/linux-build-all.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ set -e # Quit script on error
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
55

6-
cd ${SCRIPT_DIR}
7-
"${SCRIPT_DIR}/linux-prebuild.sh"
6+
cd "${SCRIPT_DIR}"
7+
"${SCRIPT_DIR}"/linux-prebuild.sh
88

9-
cd ${SCRIPT_DIR}
10-
"${SCRIPT_DIR}/linux-config.sh"
9+
cd "${SCRIPT_DIR}"
10+
"${SCRIPT_DIR}"/linux-config.sh
1111

1212

13-
cd ${SCRIPT_DIR}
13+
cd "${SCRIPT_DIR}"
1414
cd build
1515
cmake --build . --config Release
1616

17-
cd ${SCRIPT_DIR}
17+
cd "${SCRIPT_DIR}"

‎app/linux-prebuild.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,40 @@ if [ ! -f "vcpkg/vcpkg" ]; then
1313
echo "Building vcpkg"
1414
cd vcpkg
1515
./bootstrap-vcpkg.sh -disableMetrics
16-
cd ${SCRIPT_DIR}
16+
cd "${SCRIPT_DIR}"
1717
fi
1818

1919
cd vcpkg
2020
./vcpkg install kissfft fmt crossguid sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --recurse
2121

22-
cd ${SCRIPT_DIR}
22+
cd "${SCRIPT_DIR}"
2323

2424

2525
# Build external dependencies and copy to build tree
2626
echo "Building external binary dependencies..."
27-
"${SCRIPT_DIR}/external/linux_build_externals.sh"
27+
"${SCRIPT_DIR}"/external/linux_build_externals.sh
2828

29-
cp "${SCRIPT_DIR}/external/build/aubio-prefix/src/aubio-build/aubio_onset" "${SCRIPT_DIR}/server/native/"
29+
cp "${SCRIPT_DIR}"/external/build/aubio-prefix/src/aubio-build/aubio_onset "${SCRIPT_DIR}"/server/native/
3030

31-
mkdir -p "${SCRIPT_DIR}/server/beam/tau/priv/"
32-
cp ${SCRIPT_DIR}/external/build/sp_midi-prefix/src/sp_midi-build/*.so ${SCRIPT_DIR}/server/beam/tau/priv/
33-
cp ${SCRIPT_DIR}/external/build/sp_link-prefix/src/sp_link-build/*.so ${SCRIPT_DIR}/server/beam/tau/priv/
31+
mkdir -p "${SCRIPT_DIR}"/server/beam/tau/priv/
32+
cp "${SCRIPT_DIR}"/external/build/sp_midi-prefix/src/sp_midi-build/*.so "${SCRIPT_DIR}"/server/beam/tau/priv/
33+
cp "${SCRIPT_DIR}"/external/build/sp_link-prefix/src/sp_link-build/*.so "${SCRIPT_DIR}"/server/beam/tau/priv/
3434

3535
echo "Compiling native ruby extensions..."
36-
ruby "${SCRIPT_DIR}/server/ruby/bin/compile-extensions.rb"
36+
ruby "${SCRIPT_DIR}"/server/ruby/bin/compile-extensions.rb
3737

3838
echo "Translating tutorial..."
39-
ruby "${SCRIPT_DIR}/server/ruby/bin/i18n-tool.rb" -t
39+
ruby "${SCRIPT_DIR}"/server/ruby/bin/i18n-tool.rb -t
4040

4141
echo "Generating docs for the Qt GUI..."
42-
cp "${SCRIPT_DIR}/gui/qt/utils/ruby_help.tmpl" "${SCRIPT_DIR}/gui/qt/utils/ruby_help.h"
43-
ruby "${SCRIPT_DIR}/server/ruby/bin/qt-doc.rb" -o "${SCRIPT_DIR}/gui/qt/utils/ruby_help.h"
42+
cp "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.tmpl "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.h
43+
ruby "${SCRIPT_DIR}"/server/ruby/bin/qt-doc.rb -o "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.h
4444

4545
echo "Updating GUI translation files..."
4646
PATH=`pkg-config --variable bindir Qt5`:$PATH lrelease "${SCRIPT_DIR}"/gui/qt/lang/*.ts
4747

4848
echo "Compiling Erlang/Elixir files..."
49-
cd "${SCRIPT_DIR}/server/beam/tau"
49+
cd "${SCRIPT_DIR}"/server/beam/tau
5050
MIX_ENV="${MIX_ENV:-prod}" mix local.hex --force
5151
MIX_ENV="${MIX_ENV:-prod}" mix deps.get
5252
MIX_ENV="${MIX_ENV:-prod}" mix release --overwrite

‎app/mac-build-all.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
set -e # Quit script on error
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5-
cd ${SCRIPT_DIR}
5+
cd "${SCRIPT_DIR}"
66

77
"${SCRIPT_DIR}/mac-prebuild.sh"
8-
cd ${SCRIPT_DIR}
8+
cd "${SCRIPT_DIR}"
99
"${SCRIPT_DIR}/mac-config.sh"
1010

11-
cd ${SCRIPT_DIR}
11+
cd "${SCRIPT_DIR}"
1212
cd build
1313
cmake --build . --config Release
1414

15-
cd ${SCRIPT_DIR}
15+
cd "${SCRIPT_DIR}"

‎app/mac-prebuild.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ if [ ! -f "vcpkg/vcpkg" ]; then
1313
echo "Building vcpkg"
1414
cd vcpkg
1515
./bootstrap-vcpkg.sh -disableMetrics
16-
cd ${SCRIPT_DIR}
16+
cd "${SCRIPT_DIR}"
1717
fi
1818

1919
triplet=(x64-osx)
2020

2121
cd vcpkg
2222
./vcpkg install kissfft fmt sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet ${triplet[0]} --recurse
2323

24-
cd ${SCRIPT_DIR}
25-
24+
cd "${SCRIPT_DIR}"
2625

2726
# Check to see if we have a bundled Ruby and if so, use that
2827
# Otherwise use system ruby
@@ -36,54 +35,55 @@ else
3635
fi
3736

3837
echo "echo Cleaning out native dir...."
39-
rm -rf ${SCRIPT_DIR}/server/native/supercollider
40-
rm -rf ${SCRIPT_DIR}/server/native/erlang
41-
rm -rf ${SCRIPT_DIR}/server/native/scsynth
38+
rm -rf "${SCRIPT_DIR}/server/native/supercollider"
39+
rm -rf "${SCRIPT_DIR}/server/native/erlang"
40+
rm -rf "${SCRIPT_DIR}/server/native/scsynth"
4241

4342

4443
# Build external dependencies and copy to build tree
4544
echo "Building external binary dependencies..."
4645
"${SCRIPT_DIR}/external/mac_build_externals.sh"
4746

48-
cp "${SCRIPT_DIR}/external/build/aubio-prefix/src/aubio-build/aubio_onset" "${SCRIPT_DIR}/server/native/"
4947

50-
mkdir -p "${SCRIPT_DIR}/server/beam/tau/priv/"
51-
for f in ${SCRIPT_DIR}/external/build/sp_midi-prefix/src/sp_midi-build/*.dylib; do
52-
cp $f ${SCRIPT_DIR}/server/beam/tau/priv/$(basename $f .dylib).so
48+
cp "${SCRIPT_DIR}"/external/build/aubio-prefix/src/aubio-build/aubio_onset "${SCRIPT_DIR}"/server/native/
49+
50+
mkdir -p "${SCRIPT_DIR}"/server/beam/tau/priv/
51+
for f in "${SCRIPT_DIR}"/external/build/sp_midi-prefix/src/sp_midi-build/*.dylib; do
52+
cp "$f" "${SCRIPT_DIR}"/server/beam/tau/priv/$(basename "$f" .dylib).so
5353
done
5454

55-
for f in ${SCRIPT_DIR}/external/build/sp_link-prefix/src/sp_link-build/*.dylib; do
56-
cp $f ${SCRIPT_DIR}/server/beam/tau/priv/$(basename $f .dylib).so
55+
for f in "${SCRIPT_DIR}"/external/build/sp_link-prefix/src/sp_link-build/*.dylib; do
56+
cp "$f" "${SCRIPT_DIR}"/server/beam/tau/priv/$(basename "$f" .dylib).so
5757
done
5858

5959

6060
# Copy prebuilt native files to server
6161
echo "Copying prebuilt binaries to the server..."
62-
mkdir -p ${SCRIPT_DIR}/server/native/
62+
mkdir -p "${SCRIPT_DIR}"/server/native/
6363

64-
cp -R ${SCRIPT_DIR}/../prebuilt/macos/x64/* ${SCRIPT_DIR}/server/native/
64+
cp -R "${SCRIPT_DIR}"/../prebuilt/macos/x64/* "${SCRIPT_DIR}"/server/native/
6565

66-
cd ${SCRIPT_DIR}/server/native/
66+
cd "${SCRIPT_DIR}"/server/native/
6767
ln -s supercollider/scsynth scsynth
6868
mv supercollider/extra-plugins/* supercollider/plugins/
6969
rm -rf supercollider/extra-plugins
7070

7171
echo "Compiling native ruby extensions..."
72-
$RUBY "${SCRIPT_DIR}/server/ruby/bin/compile-extensions.rb"
72+
"$RUBY" "${SCRIPT_DIR}"/server/ruby/bin/compile-extensions.rb
7373

7474
echo "Translating tutorial..."
75-
$RUBY "${SCRIPT_DIR}/server/ruby/bin/i18n-tool.rb" -t
75+
"$RUBY" "${SCRIPT_DIR}"/server/ruby/bin/i18n-tool.rb -t
7676

7777
echo "Generating docs for the Qt GUI..."
78-
cp "${SCRIPT_DIR}/gui/qt/utils/ruby_help.tmpl" "${SCRIPT_DIR}/gui/qt/utils/ruby_help.h"
79-
$RUBY "${SCRIPT_DIR}/server/ruby/bin/qt-doc.rb" -o "${SCRIPT_DIR}/gui/qt/utils/ruby_help.h"
78+
cp "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.tmpl "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.h
79+
"$RUBY" "${SCRIPT_DIR}"/server/ruby/bin/qt-doc.rb -o "${SCRIPT_DIR}"/gui/qt/utils/ruby_help.h
8080

8181
echo "Updating GUI translation files..."
8282
# Use lrelease on PATH if available otherwise assume Qt was installed via homebrew
83-
PATH=$PATH:/usr/local/opt/qt@5/bin lrelease "${SCRIPT_DIR}"/gui/qt/lang/*.ts
83+
PATH="$PATH":/usr/local/opt/qt@5/bin lrelease "${SCRIPT_DIR}"/gui/qt/lang/*.ts
8484

8585
echo "Compiling Erlang/Elixir files..."
86-
cd "${SCRIPT_DIR}/server/beam/tau"
86+
cd "${SCRIPT_DIR}"/server/beam/tau
8787
MIX_ENV="${MIX_ENV:-prod}" mix local.hex --force
8888
MIX_ENV="${MIX_ENV:-prod}" mix deps.get
8989
MIX_ENV="${MIX_ENV:-prod}" mix release --overwrite

‎app/pi-build-all.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ set -e # Quit script on error
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
55

6-
cd ${SCRIPT_DIR}
7-
"${SCRIPT_DIR}/pi-prebuild.sh"
6+
cd "${SCRIPT_DIR}"
7+
"${SCRIPT_DIR}"/pi-prebuild.sh
88

9-
cd ${SCRIPT_DIR}
10-
"${SCRIPT_DIR}/pi-config.sh"
9+
cd "${SCRIPT_DIR}"
10+
"${SCRIPT_DIR}"/pi-config.sh
1111

12-
cd ${SCRIPT_DIR}
12+
cd "${SCRIPT_DIR}"
1313
cd build
1414
cmake --build . --config Release
1515

16-
cd ${SCRIPT_DIR}
16+
cd "${SCRIPT_DIR}"

‎app/pi-clean.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44

55
# Use generic linux clean script
6-
"${SCRIPT_DIR}/linux-clean.sh"
6+
"${SCRIPT_DIR}"/linux-clean.sh

‎app/pi-prebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44

55
# Use generic linux prebuild script
6-
VCPKG_FORCE_SYSTEM_BINARIES=1 "${SCRIPT_DIR}/linux-prebuild.sh"
6+
VCPKG_FORCE_SYSTEM_BINARIES=1 "${SCRIPT_DIR}"/linux-prebuild.sh

‎app/server/beam/tau/boot-lin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e # Quit script on error
33
SCRIPT_DIR="$(dirname "$0")"
4-
cd ${SCRIPT_DIR}
4+
cd "${SCRIPT_DIR}"
55

66
# Close standard output file descriptor
77
exec 1<&-

‎app/server/beam/tau/boot-mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e # Quit script on error
33
SCRIPT_DIR="$(dirname "$0")"
4-
cd ${SCRIPT_DIR}
4+
cd "${SCRIPT_DIR}"
55

66
# Close standard output file descriptor
77
exec 1<&-

0 commit comments

Comments
 (0)