52 lines
2.0 KiB
Plaintext
52 lines
2.0 KiB
Plaintext
$OpenBSD: patch-base_utils_py,v 1.6 2012/09/11 10:52:16 ajacoutot Exp $
|
|
--- base/utils.py.orig Tue Sep 4 14:34:06 2012
|
|
+++ base/utils.py Tue Sep 11 08:06:36 2012
|
|
@@ -524,7 +524,7 @@ class UserSettings(object): # Note: Deprecated after 2
|
|
if len(path):
|
|
self.cmd_pcard = 'hp-unload -d %DEVICE_URI%'
|
|
else:
|
|
- self.cmd_pcard = 'python %HOME%/unload.py -d %DEVICE_URI%'
|
|
+ self.cmd_pcard = '${MODPY_BIN} %HOME%/unload.py -d %DEVICE_URI%'
|
|
|
|
# Copy
|
|
path = which('hp-makecopies')
|
|
@@ -532,7 +532,7 @@ class UserSettings(object): # Note: Deprecated after 2
|
|
if len(path):
|
|
self.cmd_copy = 'hp-makecopies -d %DEVICE_URI%'
|
|
else:
|
|
- self.cmd_copy = 'python %HOME%/makecopies.py -d %DEVICE_URI%'
|
|
+ self.cmd_copy = '${MODPY_BIN} %HOME%/makecopies.py -d %DEVICE_URI%'
|
|
|
|
# Fax
|
|
path = which('hp-sendfax')
|
|
@@ -540,7 +540,7 @@ class UserSettings(object): # Note: Deprecated after 2
|
|
if len(path):
|
|
self.cmd_fax = 'hp-sendfax -d %FAX_URI%'
|
|
else:
|
|
- self.cmd_fax = 'python %HOME%/sendfax.py -d %FAX_URI%'
|
|
+ self.cmd_fax = '${MODPY_BIN} %HOME%/sendfax.py -d %FAX_URI%'
|
|
|
|
# Fax Address Book
|
|
path = which('hp-fab')
|
|
@@ -548,7 +548,7 @@ class UserSettings(object): # Note: Deprecated after 2
|
|
if len(path):
|
|
self.cmd_fab = 'hp-fab'
|
|
else:
|
|
- self.cmd_fab = 'python %HOME%/fab.py'
|
|
+ self.cmd_fab = '${MODPY_BIN} %HOME%/fab.py'
|
|
|
|
def load(self):
|
|
self.loadDefaults()
|
|
@@ -880,9 +880,8 @@ def all(S,f=lambda x:x):
|
|
if not f(x): return False
|
|
return True
|
|
|
|
-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
|
|
-BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
|
|
-
|
|
+BROWSERS = ['xdg-open']
|
|
+BROWSER_OPTS = {'xdg-open' : ''}
|
|
|
|
def find_browser():
|
|
if platform_avail and platform.system() == 'Darwin':
|