From 075542e4a5c5fe7cd5fc65b90034e7fe232e02d6 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Thu, 10 Dec 2015 21:31:37 +0000
Subject: [PATCH] [OSX] Fix starting deluged from connection manager

---
 deluge/main.py               | 2 +-
 packaging/osx/deluge         | 5 ++++-
 packaging/osx/deluge-console | 5 ++++-
 packaging/osx/deluge-web     | 5 ++++-
 packaging/osx/deluged        | 5 ++++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/deluge/main.py b/deluge/main.py
index 3f3a342fe..cd64ac4b4 100644
--- a/deluge/main.py
+++ b/deluge/main.py
@@ -197,7 +197,7 @@ def start_daemon():
         log.addHandler(file_handler)
 
     # If the donot daemonize is set, then we just skip the forking
-    if not (deluge.common.windows_check() or deluge.common.osx_check() or options.donot):
+    if not (deluge.common.windows_check() or options.donot):
         if os.fork():
             # We've forked and this is now the parent process, so die!
             os._exit(0)
diff --git a/packaging/osx/deluge b/packaging/osx/deluge
index d0041994c..bf8ba1ba5 100644
--- a/packaging/osx/deluge
+++ b/packaging/osx/deluge
@@ -41,6 +41,9 @@ PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/pygtk/2.0:$PYTHONPATH"
 export PYTHONPATH
 
+# Ensure deluged is available by adding macos dir to path.
+PATH=$bundle_macos:$PATH
+
 # We need a UTF-8 locale.
 lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
 if test "$?" != "0"; then
@@ -73,4 +76,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
 fi
 
 # Note that we're calling $PYTHON here to override the version used.
-$EXEC "$PYTHON" "$bundle_contents/MacOS/Deluge-bin" "$@"
+$EXEC "$PYTHON" "$bundle_macos/Deluge-bin" "$@"
diff --git a/packaging/osx/deluge-console b/packaging/osx/deluge-console
index cd413a90d..331b72fbe 100755
--- a/packaging/osx/deluge-console
+++ b/packaging/osx/deluge-console
@@ -31,6 +31,9 @@ PYTHONPATH="$bundle_lib/python/lib-dynload/:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
 export PYTHONPATH
 
+# Ensure deluged is available by adding macos dir to path.
+PATH=$bundle_macos:$PATH
+
 # We need a UTF-8 locale.
 lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
 if test "$?" != "0"; then
@@ -63,4 +66,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
 fi
 
 # Note that we're calling $PYTHON here to override the version used.
-$EXEC "$PYTHON" "$bundle_contents/MacOS/deluge-console-bin" "$@"
+$EXEC "$PYTHON" "$bundle_macos/deluge-console-bin" "$@"
diff --git a/packaging/osx/deluge-web b/packaging/osx/deluge-web
index 7d2a44a21..295950ab0 100755
--- a/packaging/osx/deluge-web
+++ b/packaging/osx/deluge-web
@@ -31,6 +31,9 @@ PYTHONPATH="$bundle_lib/python/lib-dynload/:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
 export PYTHONPATH
 
+# Ensure deluged is available by adding macos dir to path.
+PATH=$bundle_macos:$PATH
+
 # We need a UTF-8 locale.
 lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
 if test "$?" != "0"; then
@@ -63,4 +66,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
 fi
 
 # Note that we're calling $PYTHON here to override the version used.
-$EXEC "$PYTHON" "$bundle_contents/MacOS/deluge-web-bin" "$@"
+$EXEC "$PYTHON" "$bundle_macos/deluge-web-bin" "$@"
diff --git a/packaging/osx/deluged b/packaging/osx/deluged
index 6fc404ac9..cc22596ad 100755
--- a/packaging/osx/deluged
+++ b/packaging/osx/deluged
@@ -31,6 +31,9 @@ PYTHONPATH="$bundle_lib/python/lib-dynload/:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
 export PYTHONPATH
 
+# Ensure deluged is available by adding macos dir to path.
+PATH=$bundle_macos:$PATH
+
 # We need a UTF-8 locale.
 lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
 if test "$?" != "0"; then
@@ -63,4 +66,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
 fi
 
 # Note that we're calling $PYTHON here to override the version used.
-$EXEC "$PYTHON" "$bundle_contents/MacOS/deluged-bin" "$@"
+$EXEC "$PYTHON" "$bundle_macos/deluged-bin" "$@"