try to fix adding torrents when overwriting env variables

This commit is contained in:
Marcos Pinto 2007-12-26 20:06:38 +00:00
parent 5828ee03e9
commit 2465c5d214
1 changed files with 12 additions and 4 deletions

View File

@ -52,8 +52,6 @@ parser.add_option("-c", "--config", dest="config", help="Sets the configuration
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
print "checking for ubuntu..." print "checking for ubuntu..."
print options
print args
if not deluge.common.windows_check(): if not deluge.common.windows_check():
import platform import platform
if platform.system() == "Linux": # Add this, FreeBSD and other OSs than Linux do not have /etc/issue. if platform.system() == "Linux": # Add this, FreeBSD and other OSs than Linux do not have /etc/issue.
@ -62,13 +60,23 @@ if not deluge.common.windows_check():
if os.environ.get("MOZILLA_FIVE_HOME") != "/usr/lib/firefox": if os.environ.get("MOZILLA_FIVE_HOME") != "/usr/lib/firefox":
os.environ["MOZILLA_FIVE_HOME"] = "/usr/lib/firefox" os.environ["MOZILLA_FIVE_HOME"] = "/usr/lib/firefox"
os.environ["LD_LIBRARY_PATH"] = "/usr/lib/firefox" os.environ["LD_LIBRARY_PATH"] = "/usr/lib/firefox"
os.system("/usr/bin/deluge %s %s" %(options, args)) if config in options:
os.system("/usr/bin/deluge %s %s" %(options, args))
elif args:
os.system("/usr/bin/deluge %s" %(args))
else:
os.system("/usr/bin/deluge")
raise SystemExit raise SystemExit
elif platform.system() == "FreeBSD": elif platform.system() == "FreeBSD":
if os.environ.get("MOZILLA_FIVE_HOME") != "/usr/local/lib/firefox": if os.environ.get("MOZILLA_FIVE_HOME") != "/usr/local/lib/firefox":
os.environ["MOZILLA_FIVE_HOME"] = "/usr/local/lib/firefox" os.environ["MOZILLA_FIVE_HOME"] = "/usr/local/lib/firefox"
os.environ["LD_LIBRARY_PATH"] = "/usr/local/lib/firefox" os.environ["LD_LIBRARY_PATH"] = "/usr/local/lib/firefox"
os.system("/usr/local/bin/deluge %s %s" %(options, args)) if config in options:
os.system("/usr/bin/deluge %s %s" %(options, args))
elif args:
os.system("/usr/bin/deluge %s" %(args))
else:
os.system("/usr/bin/deluge")
raise SystemExit raise SystemExit
if (options.config != None): if (options.config != None):