From 983b84be3506d819adf63885d8df8b011bbf0546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Nordstr=C3=B8m?= Date: Fri, 8 Nov 2019 02:00:15 +0100 Subject: [PATCH] Remove shell script that changes directory and then executes barrier on macOS, and execute barrier directly instead. --- dist/macos/bundle/Barrier.app/Contents/Info.plist.in | 2 +- dist/macos/bundle/build_installer.sh.in | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dist/macos/bundle/Barrier.app/Contents/Info.plist.in b/dist/macos/bundle/Barrier.app/Contents/Info.plist.in index b973f5e9..277963ae 100644 --- a/dist/macos/bundle/Barrier.app/Contents/Info.plist.in +++ b/dist/macos/bundle/Barrier.app/Contents/Info.plist.in @@ -6,7 +6,7 @@ CFBundleDisplayName Barrier CFBundleExecutable - barrier.sh + barrier CFBundleIconFile Barrier.icns CFBundleIdentifier diff --git a/dist/macos/bundle/build_installer.sh.in b/dist/macos/bundle/build_installer.sh.in index 4565348d..2e07a875 100755 --- a/dist/macos/bundle/build_installer.sh.in +++ b/dist/macos/bundle/build_installer.sh.in @@ -57,11 +57,6 @@ $B_REREF_SCRIPT barrier || exit 1 # libraries in its metadata $B_REREF_SCRIPT platforms/libqcocoa.dylib ../ || exit 1 -# create a startup script that will change to the binary directory -# before starting barrier -printf "%s\n" "#!/bin/sh" "cd \$(dirname \$0)" "exec ./barrier" > barrier.sh -chmod +x barrier.sh - echo "Barrier.app created successfully" # sanity check so we don't distribute a dmg with debug symbols