mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-11 02:48:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[OSX] Fix starting deluged from connection manager

Browse source
This commit is contained in:
Calum Lind 2015-12-10 21:31:37 +00:00
commit 9038357d78
6 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deluge/main.py
View file

@ -207,7 +207,7 @@ this should be an IP address", metavar="IFACE",
# If the donot daemonize is set, then we just skip the forking # If the donot daemonize is set, then we just skip the forking
if not options.donot: if not options.donot:
# Windows check, we log to the config folder by default # Windows check, we log to the config folder by default
if deluge.common.windows_check() or deluge.common.osx_check(): if deluge.common.windows_check():
open_logfile() open_logfile()
write_pidfile() write_pidfile()
else: else:

2
deluge/ui/client.py
View file

@ -576,8 +576,6 @@ class Client(object):
try: try:
if deluge.common.windows_check(): if deluge.common.windows_check():
subprocess.Popen(["deluged", "--port=%s" % port, "--config=%s" % config]) subprocess.Popen(["deluged", "--port=%s" % port, "--config=%s" % config])
elif deluge.common.osx_check():
subprocess.call(["nohup", "deluged", "--port=%s" % port, "--config=%s" % config])
else: else:
subprocess.call(["deluged", "--port=%s" % port, "--config=%s" % config]) subprocess.call(["deluged", "--port=%s" % port, "--config=%s" % config])
except OSError, e: except OSError, e:

5
osx/deluge
View file

@ -41,6 +41,9 @@ PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
PYTHONPATH="$bundle_lib/pygtk/2.0:$PYTHONPATH" PYTHONPATH="$bundle_lib/pygtk/2.0:$PYTHONPATH"
export PYTHONPATH export PYTHONPATH
# Ensure deluged is available by adding macos dir to path.
PATH=$bundle_macos:$PATH
# We need a UTF-8 locale. # We need a UTF-8 locale.
lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null` lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
if test "$?" != "0"; then if test "$?" != "0"; then
@ -73,4 +76,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
fi fi
# Note that we're calling $PYTHON here to override the version used. # 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
osx/deluge-console
View file

@ -31,6 +31,9 @@ PYTHONPATH="$bundle_lib/python/lib-dynload/:$PYTHONPATH"
PYTHONPATH="$bundle_lib/python/:$PYTHONPATH" PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
export PYTHONPATH export PYTHONPATH
# Ensure deluged is available by adding macos dir to path.
PATH=$bundle_macos:$PATH
# We need a UTF-8 locale. # We need a UTF-8 locale.
lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null` lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
if test "$?" != "0"; then if test "$?" != "0"; then
@ -63,4 +66,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
fi fi
# Note that we're calling $PYTHON here to override the version used. # 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
osx/deluge-web
View file

@ -31,6 +31,9 @@ PYTHONPATH="$bundle_lib/python/lib-dynload/:$PYTHONPATH"
PYTHONPATH="$bundle_lib/python/:$PYTHONPATH" PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
export PYTHONPATH export PYTHONPATH
# Ensure deluged is available by adding macos dir to path.
PATH=$bundle_macos:$PATH
# We need a UTF-8 locale. # We need a UTF-8 locale.
lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null` lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
if test "$?" != "0"; then if test "$?" != "0"; then
@ -63,4 +66,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
fi fi
# Note that we're calling $PYTHON here to override the version used. # 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
osx/deluged
View file

@ -31,6 +31,9 @@ PYTHONPATH="$bundle_lib/python/lib-dynload/:$PYTHONPATH"
PYTHONPATH="$bundle_lib/python/:$PYTHONPATH" PYTHONPATH="$bundle_lib/python/:$PYTHONPATH"
export PYTHONPATH export PYTHONPATH
# Ensure deluged is available by adding macos dir to path.
PATH=$bundle_macos:$PATH
# We need a UTF-8 locale. # We need a UTF-8 locale.
lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null` lang=`defaults read .GlobalPreferences AppleLocale 2>/dev/null`
if test "$?" != "0"; then if test "$?" != "0"; then
@ -63,4 +66,4 @@ if [ "x`echo "x$1" | sed -e "s/^x-psn_.*//"`" == "x" ]; then
fi fi
# Note that we're calling $PYTHON here to override the version used. # 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" "$@"