jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Old versions of node-webkit were not working. Added a temporary fix.

Browse source
This commit is contained in:
Joey Payne 2014-09-29 11:58:21 +13:00
commit f06d1b7691
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
main.py
View file

@ -117,6 +117,17 @@ class Setting(object):
new_bytes = file.read(extract_path.format(version)) new_bytes = file.read(extract_path.format(version))
except KeyError as e: except KeyError as e:
log(e) log(e)
#dirty hack to support old versions of nw
if 'no item named' in str(e):
extract_path='/'.join(extract_path.split('/')[1:])
try:
if self.file_ext == '.gz':
new_bytes = file.extractfile(extract_path).read()
elif self.file_ext == '.zip':
new_bytes = file.read(extract_path)
except KeyError as e:
log(e)
print e
print e print e
if new_bytes is not None: if new_bytes is not None:
@ -186,7 +197,7 @@ class MainWindow(QtGui.QWidget):
'libEGL.dll', 'libEGL.dll',
'libGLESv2.dll']), 'libGLESv2.dll']),
'mac': Setting('mac', default_value=False, type='check', 'mac': Setting('mac', default_value=False, type='check',
url=base_url+'node-webkit-v{}-osx-ia32.zip', url=base_url+mac_32_dir_prefix+'.zip',
extract_file=mac_32_dir_prefix+'/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework', extract_file=mac_32_dir_prefix+'/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework',
extract_files=[mac_32_dir_prefix+'/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework', extract_files=[mac_32_dir_prefix+'/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework',
mac_32_dir_prefix+'/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nw.pak', mac_32_dir_prefix+'/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nw.pak',