From ab133706f5b340007b8aa5b230f9018538b749d8 Mon Sep 17 00:00:00 2001 From: xarkes Date: Tue, 6 Nov 2018 15:49:14 +0100 Subject: [PATCH] Fixed MacOS start script (#909) --- .travis.yml | 1 + docs/building.md | 1 + src/macos/Cutter | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 950c9c2f..bbab6dbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,6 +72,7 @@ script: after_success: - export CUTTER_VERSION=$(python ../scripts/get_version.py) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + mv Cutter.app/Contents/MacOS/Cutter Cutter.app/Contents/MacOS/Cutter.bin cp ../src/macos/Cutter Cutter.app/Contents/MacOS/Cutter && chmod +x Cutter.app/Contents/MacOS/Cutter && macdeployqt Cutter.app -executable=Cutter.app/Contents/MacOS/Cutter && "$TRAVIS_BUILD_DIR/scripts/appbundle_embed_python.sh" "$PYTHON_FRAMEWORK_DIR/Python.framework" Cutter.app Cutter.app/Contents/MacOS/Cutter && diff --git a/docs/building.md b/docs/building.md index 0a3117ba..6f5fba4f 100644 --- a/docs/building.md +++ b/docs/building.md @@ -46,6 +46,7 @@ cd .. On macOS you will also have to copy the launcher bash script: ```sh +mv Cutter.app/Contents/MacOS/Cutter Cutter.app/Contents/MacOS/Cutter.bin cp ../src/macos/Cutter Cutter.app/Contents/MacOS/Cutter && chmod +x Cutter.app/Contents/MacOS/Cutter ``` diff --git a/src/macos/Cutter b/src/macos/Cutter index 169a7934..65a40291 100755 --- a/src/macos/Cutter +++ b/src/macos/Cutter @@ -5,4 +5,4 @@ echo "Cutter Launch Script for macOS" EXECDIR=$(dirname "$0") export DYLD_LIBRARY_PATH="$EXECDIR/../Frameworks" export DYLD_FRAMEWORK_PATH="$EXECDIR/../Frameworks" -"$EXECDIR/Cutter" "$@" +"$EXECDIR/Cutter.bin" "$@"