Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed Windows/OSX image path problem, and updated NSIS Windows installer to install all the new .py files from refactoring

Browse Source
This commit is contained in:
Micah Lee 2014-09-04 13:20:39 -07:00
parent 3c071ce500
commit d73d859fed
4 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionshare_gui/common.py
View File

@ -32,5 +32,5 @@ def get_image_path(filename):
if platform.system() == 'Linux': if platform.system() == 'Linux':
prefix = os.path.join(sys.prefix, 'share/onionshare/images') prefix = os.path.join(sys.prefix, 'share/onionshare/images')
else: else:
prefix = os.path.join(get_onionshare_gui_dir(), 'images') prefix = os.path.join(os.path.dirname(get_onionshare_gui_dir()), 'images')
return os.path.join(prefix, filename) return os.path.join(prefix, filename)

10
setup/onionshare-osx.spec
View File

@ -8,11 +8,11 @@ a.datas += [
('onionshare/strings.json', 'onionshare/strings.json', 'DATA'), ('onionshare/strings.json', 'onionshare/strings.json', 'DATA'),
('onionshare/index.html', 'onionshare/index.html', 'DATA'), ('onionshare/index.html', 'onionshare/index.html', 'DATA'),
('onionshare/404.html', 'onionshare/404.html', 'DATA'), ('onionshare/404.html', 'onionshare/404.html', 'DATA'),
('images/logo.png', 'onionshare_gui/images/logo.png', 'DATA'), ('images/logo.png', 'images/logo.png', 'DATA'),
('images/drop_files.png', 'onionshare_gui/images/drop_files.png', 'DATA'), ('images/drop_files.png', 'images/drop_files.png', 'DATA'),
('images/server_stopped.png', 'onionshare_gui/images/server_stopped.png', 'DATA'), ('images/server_stopped.png', 'images/server_stopped.png', 'DATA'),
('images/server_started.png', 'onionshare_gui/images/server_started.png', 'DATA'), ('images/server_started.png', 'images/server_started.png', 'DATA'),
('images/server_working.png', 'onionshare_gui/images/server_working.png', 'DATA'), ('images/server_working.png', 'images/server_working.png', 'DATA'),
] ]
pyz = PYZ(a.pure) pyz = PYZ(a.pure)
exe = EXE(pyz, exe = EXE(pyz,

7
setup/onionshare-win.spec
View File

@ -3,6 +3,13 @@ a = Analysis(['setup/onionshare-launcher.py'],
hiddenimports=['onionshare', 'onionshare_gui'], hiddenimports=['onionshare', 'onionshare_gui'],
hookspath=None, hookspath=None,
runtime_hooks=None) runtime_hooks=None)
a.datas += [
('images/logo.png', 'images/logo.png', 'DATA'),
('images/drop_files.png', 'images/drop_files.png', 'DATA'),
('images/server_stopped.png', 'images/server_stopped.png', 'DATA'),
('images/server_started.png', 'images/server_started.png', 'DATA'),
('images/server_working.png', 'images/server_working.png', 'DATA'),
]
pyz = PYZ(a.pure) pyz = PYZ(a.pure)
exe = EXE(pyz, exe = EXE(pyz,
a.scripts, a.scripts,

58
setup/onionshare.nsi
View File

@ -46,19 +46,37 @@ Section "install"
File "${BINPATH}\onionshare.exe" File "${BINPATH}\onionshare.exe"
File "${BINPATH}\LICENSE" File "${BINPATH}\LICENSE"
SetOutPath "$INSTDIR\onionshare" SetOutPath "$INSTDIR\onionshare"
File "${BINPATH}\onionshare\404.html"
File "${BINPATH}\onionshare\__init__.py" File "${BINPATH}\onionshare\__init__.py"
File "${BINPATH}\onionshare\__init__.pyc" File "${BINPATH}\onionshare\__init__.pyc"
File "${BINPATH}\onionshare\404.html"
File "${BINPATH}\onionshare\helpers.py"
File "${BINPATH}\onionshare\helpers.pyc"
File "${BINPATH}\onionshare\index.html" File "${BINPATH}\onionshare\index.html"
File "${BINPATH}\onionshare\onionshare.py" File "${BINPATH}\onionshare\onionshare.py"
File "${BINPATH}\onionshare\onionshare.pyc" File "${BINPATH}\onionshare\onionshare.pyc"
File "${BINPATH}\onionshare\socks.py"
File "${BINPATH}\onionshare\socks.pyc"
File "${BINPATH}\onionshare\strings.json" File "${BINPATH}\onionshare\strings.json"
File "${BINPATH}\onionshare\strings.py"
File "${BINPATH}\onionshare\strings.pyc"
File "${BINPATH}\onionshare\web.py"
File "${BINPATH}\onionshare\web.pyc"
SetOutPath "$INSTDIR\onionshare_gui" SetOutPath "$INSTDIR\onionshare_gui"
File "${BINPATH}\onionshare_gui\onionshare_gui.py"
File "${BINPATH}\onionshare_gui\onionshare_gui.pyc"
File "${BINPATH}\onionshare_gui\__init__.py" File "${BINPATH}\onionshare_gui\__init__.py"
File "${BINPATH}\onionshare_gui\__init__.pyc" File "${BINPATH}\onionshare_gui\__init__.pyc"
SetOutPath "$INSTDIR\onionshare_gui\images" File "${BINPATH}\onionshare_gui\common.py"
File "${BINPATH}\onionshare_gui\common.pyc"
File "${BINPATH}\onionshare_gui\downloads.py"
File "${BINPATH}\onionshare_gui\downloads.pyc"
File "${BINPATH}\onionshare_gui\file_selection.py"
File "${BINPATH}\onionshare_gui\file_selection.pyc"
File "${BINPATH}\onionshare_gui\onionshare_gui.py"
File "${BINPATH}\onionshare_gui\onionshare_gui.pyc"
File "${BINPATH}\onionshare_gui\options.py"
File "${BINPATH}\onionshare_gui\options.pyc"
File "${BINPATH}\onionshare_gui\server_status.py"
File "${BINPATH}\onionshare_gui\server_status.pyc"
SetOutPath "$INSTDIR\images"
File "${BINPATH}\images\logo.png" File "${BINPATH}\images\logo.png"
File "${BINPATH}\images\drop_files.png" File "${BINPATH}\images\drop_files.png"
File "${BINPATH}\images\server_stopped.png" File "${BINPATH}\images\server_stopped.png"
@ -157,22 +175,40 @@ Section "uninstall"
Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\onionshare.ico" Delete "$INSTDIR\onionshare.ico"
Delete "$INSTDIR\uninstall.exe" Delete "$INSTDIR\uninstall.exe"
Delete "$INSTDIR\onionshare\404.html"
Delete "$INSTDIR\onionshare\__init__.py" Delete "$INSTDIR\onionshare\__init__.py"
Delete "$INSTDIR\onionshare\__init__.pyc" Delete "$INSTDIR\onionshare\__init__.pyc"
Delete "$INSTDIR\onionshare\404.html"
Delete "$INSTDIR\onionshare\helpers.py"
Delete "$INSTDIR\onionshare\helpers.pyc"
Delete "$INSTDIR\onionshare\index.html" Delete "$INSTDIR\onionshare\index.html"
Delete "$INSTDIR\onionshare\onionshare.py" Delete "$INSTDIR\onionshare\onionshare.py"
Delete "$INSTDIR\onionshare\onionshare.pyc" Delete "$INSTDIR\onionshare\onionshare.pyc"
Delete "$INSTDIR\onionshare\socks.py"
Delete "$INSTDIR\onionshare\socks.pyc"
Delete "$INSTDIR\onionshare\strings.json" Delete "$INSTDIR\onionshare\strings.json"
Delete "$INSTDIR\onionshare\strings.py"
Delete "$INSTDIR\onionshare\strings.pyc"
Delete "$INSTDIR\onionshare\web.py"
Delete "$INSTDIR\onionshare\web.pyc"
Delete "$INSTDIR\onionshare_gui\__init__.py" Delete "$INSTDIR\onionshare_gui\__init__.py"
Delete "$INSTDIR\onionshare_gui\__init__.pyc" Delete "$INSTDIR\onionshare_gui\__init__.pyc"
Delete "$INSTDIR\onionshare_gui\images\logo.png" Delete "$INSTDIR\onionshare_gui\common.py"
Delete "$INSTDIR\onionshare_gui\images\drop_files.png" Delete "$INSTDIR\onionshare_gui\common.pyc"
Delete "$INSTDIR\onionshare_gui\images\server_stopped.png" Delete "$INSTDIR\onionshare_gui\downloads.py"
Delete "$INSTDIR\onionshare_gui\images\server_started.png" Delete "$INSTDIR\onionshare_gui\downloads.pyc"
Delete "$INSTDIR\onionshare_gui\images\server_working.png" Delete "$INSTDIR\onionshare_gui\file_selection.py"
Delete "$INSTDIR\onionshare_gui\file_selection.pyc"
Delete "$INSTDIR\onionshare_gui\onionshare_gui.py" Delete "$INSTDIR\onionshare_gui\onionshare_gui.py"
Delete "$INSTDIR\onionshare_gui\onionshare_gui.pyc" Delete "$INSTDIR\onionshare_gui\onionshare_gui.pyc"
Delete "$INSTDIR\onionshare_gui\options.py"
Delete "$INSTDIR\onionshare_gui\options.pyc"
Delete "$INSTDIR\onionshare_gui\server_status.py"
Delete "$INSTDIR\onionshare_gui\server_status.pyc"
Delete "$INSTDIR\images\logo.png"
Delete "$INSTDIR\images\drop_files.png"
Delete "$INSTDIR\images\server_stopped.png"
Delete "$INSTDIR\images\server_started.png"
Delete "$INSTDIR\images\server_working.png"
Delete "$INSTDIR\qt4_plugins\accessible\qtaccessiblewidgets4.dll" Delete "$INSTDIR\qt4_plugins\accessible\qtaccessiblewidgets4.dll"
Delete "$INSTDIR\qt4_plugins\graphicssystems\qglgraphicssystem4.dll" Delete "$INSTDIR\qt4_plugins\graphicssystems\qglgraphicssystem4.dll"
Delete "$INSTDIR\qt4_plugins\iconengines\qsvgicon4.dll" Delete "$INSTDIR\qt4_plugins\iconengines\qsvgicon4.dll"
@ -216,8 +252,8 @@ Section "uninstall"
Delete "$INSTDIR\win32wnet.pyd" Delete "$INSTDIR\win32wnet.pyd"
rmDir "$INSTDIR\onionshare" rmDir "$INSTDIR\onionshare"
rmDir "$INSTDIR\onionshare_gui\images"
rmDir "$INSTDIR\onionshare_gui" rmDir "$INSTDIR\onionshare_gui"
rmDir "$INSTDIR\images"
rmDir "$INSTDIR\Include" rmDir "$INSTDIR\Include"
rmDir "$INSTDIR\qt4_plugins\accessible" rmDir "$INSTDIR\qt4_plugins\accessible"
rmDir "$INSTDIR\qt4_plugins\bearer" rmDir "$INSTDIR\qt4_plugins\bearer"