From bce8ecd4b0ed20044ea99f4ebdfaf2e3b6fdb59a Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 26 Jun 2014 12:05:01 -0400 Subject: [PATCH] fixed setup.py after ripping out windows and osx --- setup.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 024966d6..3482bf3f 100644 --- a/setup.py +++ b/setup.py @@ -17,16 +17,6 @@ def file_list(path): return files version = open('version').read().strip() -args = {} - -else: - args['packages'] = ['onionshare', 'onionshare_gui'] - args['include_package_data'] = True - args['scripts'] = ['bin/onionshare', 'bin/onionshare-gui'] - args['data_files'] = [ - ('/usr/share/applications', ['setup/onionshare.desktop']), - ('/usr/share/pixmaps', ['setup/onionshare80.xpm']) - ] setup( name='onionshare', @@ -38,6 +28,12 @@ setup( url='https://github.com/micahflee/onionshare', license="GPL v3", keywords='onion, share, onionshare, tor, anonymous, web server', - **args + packages=['onionshare', 'onionshare_gui'], + include_package_data=True, + scripts=['bin/onionshare', 'bin/onionshare-gui'], + data_files=[ + ('/usr/share/applications', ['setup/onionshare.desktop']), + ('/usr/share/pixmaps', ['setup/onionshare80.xpm']) + ] )