From 989555872e4b7108682ea57c348c5649b083c61f Mon Sep 17 00:00:00 2001 From: xarkes Date: Fri, 19 Oct 2018 01:36:31 +0200 Subject: [PATCH] Changed Cutter.sh to Cutter for macos (Fixes #787) (#853) * Changed Cutter.sh to Cutter for macos (Fixes #787) --- .gitignore | 1 - .travis.yml | 2 +- docs/building.md | 2 +- src/macos/{Cutter.sh => Cutter} | 0 src/macos/Info.plist | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) rename src/macos/{Cutter.sh => Cutter} (100%) diff --git a/.gitignore b/.gitignore index 2509c5f9..b146d4d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # Binaries -Cutter AStyle* # OSX files diff --git a/.travis.yml b/.travis.yml index 56f6b734..c1b8080d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ script: after_success: - export CUTTER_VERSION=$(python ../scripts/get_version.py) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - cp ../src/macos/Cutter.sh Cutter.app/Contents/MacOS/Cutter.sh && chmod +x Cutter.app/Contents/MacOS/Cutter.sh && + 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 && mkdir -p Cutter.app/Contents/Resources/r2/share && diff --git a/docs/building.md b/docs/building.md index 0b4d506d..0a3117ba 100644 --- a/docs/building.md +++ b/docs/building.md @@ -46,7 +46,7 @@ cd .. On macOS you will also have to copy the launcher bash script: ```sh -cp ../src/macos/Cutter.sh Cutter.app/Contents/MacOS/Cutter.sh && chmod +x Cutter.app/Contents/MacOS/Cutter.sh +cp ../src/macos/Cutter Cutter.app/Contents/MacOS/Cutter && chmod +x Cutter.app/Contents/MacOS/Cutter ``` --- diff --git a/src/macos/Cutter.sh b/src/macos/Cutter similarity index 100% rename from src/macos/Cutter.sh rename to src/macos/Cutter diff --git a/src/macos/Info.plist b/src/macos/Info.plist index 57c4caec..d8a1b377 100644 --- a/src/macos/Info.plist +++ b/src/macos/Info.plist @@ -5,7 +5,7 @@ CFBundleDisplayName Cutter CFBundleExecutable - Cutter.sh + Cutter CFBundleVersion @FULL_VERSION@ CFBundleShortVersionString