Deluge
diff options
| author | Calum Lind <calumlind+deluge@gmail.com> | 2015-12-10 21:31:37 +0000 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2015-12-11 12:11:38 +0000 |
| commit | 075542e4a5c5fe7cd5fc65b90034e7fe232e02d6 (patch) | |
| tree | 72714e8b70841437dab0d380c722ea22739a9a36 /packaging | |
| parent | c1902e4396103b3be9e95f05bad2363f2f76653d (diff) | |
| download | deluge-075542e4a5c5fe7cd5fc65b90034e7fe232e02d6.tar.gz deluge-075542e4a5c5fe7cd5fc65b90034e7fe232e02d6.tar.bz2 deluge-075542e4a5c5fe7cd5fc65b90034e7fe232e02d6.zip | |
[OSX] Fix starting deluged from connection manager
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/osx/deluge | 5 | ||||
| -rwxr-xr-x | packaging/osx/deluge-console | 5 | ||||
| -rwxr-xr-x | packaging/osx/deluge-web | 5 | ||||
| -rwxr-xr-x | packaging/osx/deluged | 5 |
4 files changed, 16 insertions, 4 deletions
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" "$@" |