summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjak1 <mike.wollmann@gmail.com>2021-03-17 09:47:39 +0100
committerjak1 <mike.wollmann@gmail.com>2021-03-17 09:47:39 +0100
commitadc4ba33439338399ccdbe431f225932479d08c2 (patch)
treee8ffec24bcd023ecfcb0d9279ea7e1793ed95eca
parentd9b7af98d5234e3d1863f0aea237e62960f3a8ac (diff)
downloaddocker-windows-builder-adc4ba33439338399ccdbe431f225932479d08c2.tar.gz
docker-windows-builder-adc4ba33439338399ccdbe431f225932479d08c2.tar.bz2
docker-windows-builder-adc4ba33439338399ccdbe431f225932479d08c2.tar.xz
docker-windows-builder-adc4ba33439338399ccdbe431f225932479d08c2.zip
only apply patch if file exists
-rw-r--r--manaplus.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/manaplus.sh b/manaplus.sh
index 130c27e..88da660 100644
--- a/manaplus.sh
+++ b/manaplus.sh
@@ -66,9 +66,10 @@ cp /mxe/usr/i686-w64-mingw32.shared/bin/gdb.exe /libs/dll/
cp /manaplus/tools/ci/scripts/winvars.sh manaplus/build/
cd /manaplus/
-# v change this in client repo laterâ„¢
-git apply ../manaplus.patch
-# ^ change this in client repo laterâ„¢
+patch_file="../manaplus.patch"
+if [[ -f $patch_file ]]; then
+ git apply $patch_file || exit 1
+fi
cd /manaplus/build/
./winmake --enable-commandlinepassword || exit 1