From 07bdbd571497a306780768ce6ede3a029c386229 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 12 Apr 2016 10:46:44 -0700 Subject: [PATCH] Renamed linux_scripts to scripts, since they are now used for Linux, OSX, and Windows --- install/pyinstaller.spec | 2 +- install/{linux_scripts => scripts}/onionshare | 0 install/{linux_scripts => scripts}/onionshare-gui | 0 setup.py | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename install/{linux_scripts => scripts}/onionshare (100%) rename install/{linux_scripts => scripts}/onionshare-gui (100%) diff --git a/install/pyinstaller.spec b/install/pyinstaller.spec index 1dbec3b9..6ee8f814 100644 --- a/install/pyinstaller.spec +++ b/install/pyinstaller.spec @@ -6,7 +6,7 @@ system = platform.system() block_cipher = None a = Analysis( - ['linux_scripts/onionshare-gui'], + ['scripts/onionshare-gui'], pathex=['.'], binaries=None, datas=[ diff --git a/install/linux_scripts/onionshare b/install/scripts/onionshare similarity index 100% rename from install/linux_scripts/onionshare rename to install/scripts/onionshare diff --git a/install/linux_scripts/onionshare-gui b/install/scripts/onionshare-gui similarity index 100% rename from install/linux_scripts/onionshare-gui rename to install/scripts/onionshare-gui diff --git a/setup.py b/setup.py index 414b060d..05db98be 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,7 @@ setup( keywords='onion, share, onionshare, tor, anonymous, web server', packages=['onionshare', 'onionshare_gui'], include_package_data=True, - scripts=['install/linux_scripts/onionshare', 'install/linux_scripts/onionshare-gui'], + scripts=['install/scripts/onionshare', 'install/scripts/onionshare-gui'], data_files=[ (os.path.join(sys.prefix, 'share/applications'), ['install/onionshare.desktop']), (os.path.join(sys.prefix, 'share/appdata'), ['install/onionshare.appdata.xml']),