Merge pull request from eli-schwartz/master

Linux: Allow using ~ when specifying a wineprefix.
Python2
apprenticeharper 2015-09-01 06:57:48 +01:00
commit b8606cd182
1 zmienionych plików z 1 dodań i 0 usunięć
DeDRM_calibre_plugin/DeDRM_plugin

Wyświetl plik

@ -26,6 +26,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
if not os.path.exists(outdirpath):
os.makedirs(outdirpath)
wineprefix = os.path.abspath(os.path.expanduser(os.path.expandvars(wineprefix)))
if wineprefix != "" and os.path.exists(wineprefix):
cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
else: