Skip to content

Commit 06cc72f

Browse files
authored
Merge pull request #119 from umarcor/umarcor/dirname
2 parents 8f6852e + ccec966 commit 06cc72f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fi
2626
godot_branch=$1
2727
base_distro=$2
2828
img_version=$godot_branch-$base_distro
29-
files_root=$(pwd)/files
29+
files_root="$(cd dirname "$0"; pwd)/files"
3030
build_msvc=0
3131

3232
# Confirm settings
@@ -57,8 +57,8 @@ $podman_build -t godot-android:${img_version} -f Dockerfile.android . 2>&1 | tee
5757
XCODE_SDK=14.1
5858
OSX_SDK=13.0
5959
IOS_SDK=16.1
60-
if [ ! -e files/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneOS${IOS_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz ]; then
61-
if [ ! -e files/Xcode_${XCODE_SDK}.xip ]; then
60+
if [ ! -e ${files_root}/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e ${files_root}/iPhoneOS${IOS_SDK}.sdk.tar.xz ] || [ ! -e ${files_root}/iPhoneSimulator${IOS_SDK}.sdk.tar.xz ]; then
61+
if [ ! -e ${files_root}/Xcode_${XCODE_SDK}.xip ]; then
6262
echo "files/Xcode_${XCODE_SDK}.xip is required. It can be downloaded from https://developer.apple.com/download/more/ with a valid apple ID."
6363
exit 1
6464
fi
@@ -72,7 +72,7 @@ $podman_build -t godot-osx:${img_version} -f Dockerfile.osx . 2>&1 | tee logs/os
7272
$podman_build -t godot-ios:${img_version} -f Dockerfile.ios . 2>&1 | tee logs/ios.log
7373

7474
if [ "${build_msvc}" != "0" ]; then
75-
if [ ! -e files/msvc2017.tar ]; then
75+
if [ ! -e ${files_root}/msvc2017.tar ]; then
7676
echo
7777
echo "files/msvc2017.tar is missing. This file can be created on a Windows 7 or 10 machine by downloading the 'Visual Studio Tools' installer."
7878
echo "here: https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2017"

0 commit comments

Comments
 (0)