codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-22 16:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OSX] Fix starting deluged from connection manager

Browse Source
This commit is contained in:
Calum Lind 2015-12-10 21:31:37 +00:00
parent c1902e4396
commit 075542e4a5
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deluge/main.py
View File

@ -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)

5
packaging/osx/deluge
View File

@ -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" "$@"

5
packaging/osx/deluge-console
View File

@ -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" "$@"

5
packaging/osx/deluge-web
View File

@ -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" "$@"

5
packaging/osx/deluged
View File

@ -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" "$@"