Another fixup for OS X.

woden-engine · Feb 23, 2017 · 7ef9787 · 7ef9787
1 parent ec3e7ab
commit 7ef9787
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/fetchVM32.sh b/fetchVM32.sh
@@ -13,14 +13,8 @@ case $OS in
         fetch_zip "http://ronie.cl/files/lowcode/osx/32x86-pharo.cog.spur.lowcode-Release.zip" 32x86-pharo.cog.spur.lowcode-Release.zip || exit 1
         fetch_zip "http://files.pharo.org/get-files/50/sources.zip" PharoSourcesV50.zip || exit 1
 
-        # Remove the unused libSDL2.dylib
-        rm -f "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2.dylib"
-
-        # If we have a system installed version of libSDL2-2.0.0.dylib,
-        # then remove the bundled version. We remove them because they tend to conflict.
-        if test -e "/usr/local/lib/libSDL2-2.0.0.dylib"; then
-            rm -f "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2-2.0.0.dylib"
-        fi
+        # Zip does not preserve a symlink.
+        ln -sf "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2-2.0.0.dylib" "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2.dylib"
 
         useVM "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Pharo"
         ;;

diff --git a/fetchVM64.sh b/fetchVM64.sh
@@ -13,15 +13,9 @@ case $OS in
         fetch_zip "http://ronie.cl/files/lowcode/osx/64x64-pharo.cog.spur.lowcode-Release.zip" 64x64-pharo.cog.spur.lowcode-Release.zip || exit 1
         fetch_zip "http://files.pharo.org/get-files/50/sources.zip" PharoSourcesV50.zip || exit 1
 
-        # Remove the unused libSDL2.dylib
-        rm -f "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2.dylib"
+        # Zip does not preserve a symlink.
+        ln -sf "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2-2.0.0.dylib" "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2.dylib"
 
-        # If we have a system installed version of libSDL2-2.0.0.dylib,
-        # then remove the bundled version. We remove them because they tend to conflict.
-        if test -e "/usr/local/lib/libSDL2-2.0.0.dylib"; then
-            rm -f "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Plugins/libSDL2-2.0.0.dylib"
-        fi
-
         useVM "$WODEN2_SRC_TOP/Pharo.app/Contents/MacOS/Pharo"
         ;;