moving platform-specific scripts into install folder, and making onionshare CLI work in OSX (#132)

This commit is contained in:
Micah Lee 2015-05-15 18:52:20 -07:00
parent d6aafd88e7
commit 2ea0c6aef3
7 changed files with 63 additions and 6 deletions

View file

@ -83,7 +83,7 @@ if system == 'Linux':
keywords='onion, share, onionshare, tor, anonymous, web server',
packages=['onionshare', 'onionshare_gui'],
include_package_data=True,
scripts=['bin/onionshare', 'bin/onionshare-gui'],
scripts=['install/linux_scripts/onionshare', 'install/linux_scripts/onionshare-gui'],
data_files=[
(os.path.join(sys.prefix, 'share/applications'), ['install/onionshare.desktop']),
(os.path.join(sys.prefix, 'share/pixmaps'), ['install/onionshare80.xpm']),
@ -98,7 +98,7 @@ elif system == 'Darwin':
version=version,
description=description,
long_description=long_description,
app=['install/onionshare-launcher.py'],
app=['install/osx_scripts/onionshare-gui'],
data_files=[
('images', images),
('locale', locale),
@ -107,7 +107,8 @@ elif system == 'Darwin':
options={
'py2app': {
'argv_emulation': True,
'iconfile':'install/onionshare.icns',
'iconfile': 'install/onionshare.icns',
'extra_scripts': ['install/osx_scripts/onionshare'],
'includes': [
'PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui',
'jinja2', 'jinja2.ext', 'jinja2.ext.autoescape'],