From b2cb1dd2e1c670ef49ab0e80a4162782a286b513 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 7 May 2020 17:14:48 -0700 Subject: [PATCH] Switch from scripts to entrypoints in setup.py; remove python-packages from snap because they are defined in poetry; fix onionshare and onionshare-gui snap apps definition; switch back to download Qt5 from the internet --- install/scripts/onionshare | 22 ---------------------- install/scripts/onionshare-gui | 22 ---------------------- setup.py | 8 ++++++-- snap/snapcraft.yaml | 33 +++++++++++---------------------- 4 files changed, 17 insertions(+), 68 deletions(-) delete mode 100755 install/scripts/onionshare delete mode 100755 install/scripts/onionshare-gui diff --git a/install/scripts/onionshare b/install/scripts/onionshare deleted file mode 100755 index e2205e04..00000000 --- a/install/scripts/onionshare +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2018 Micah Lee - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" -import onionshare -onionshare.main() diff --git a/install/scripts/onionshare-gui b/install/scripts/onionshare-gui deleted file mode 100755 index fed29d83..00000000 --- a/install/scripts/onionshare-gui +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2018 Micah Lee - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" -import onionshare_gui -onionshare_gui.main() diff --git a/setup.py b/setup.py index 9e0ba373..3ffff253 100644 --- a/setup.py +++ b/setup.py @@ -97,7 +97,11 @@ setup( "onionshare_gui.tab.mode.receive_mode", "onionshare_gui.tab.mode.website_mode", ], - # include_package_data=True, - scripts=["install/scripts/onionshare", "install/scripts/onionshare-gui"], + entry_points={ + "console_scripts": [ + "onionshare = onionshare:main", + "onionshare-gui = onionshare_gui:main", + ], + }, data_files=data_files, ) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d41db04b..5ce700ed 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -18,19 +18,20 @@ apps: common-id: org.onionshare.OnionShareGui command: onionshare-gui plugs: + - desktop - home - - opengl - network - network-bind - - pulseaudio + - removable-media - # onionshare: - # common-id: org.onionshare.OnionShare - # command: onionshare - # plugs: - # - home - # - network - # - network-bind + onionshare: + common-id: org.onionshare.OnionShare + command: onionshare + plugs: + - home + - network + - network-bind + - removable-media parts: onionshare: @@ -41,17 +42,6 @@ parts: python-version: python3 python-packages: - poetry - - setuptools - - wheel - - Click - - Flask - - Flask-HTTPAuth - - pycryptodome - - PyQt5==5.14.0 - - PyQt5-sip - - PySocks - - requests - - stem stage-packages: - libatk-bridge2.0-0 - libatspi2.0-0 @@ -63,8 +53,7 @@ parts: qt5: plugin: nil override-pull: | - #wget https://download.qt.io/official_releases/qt/5.14/5.14.0/qt-opensource-linux-x64-5.14.0.run - wget http://10.51.172.1:8000/qt-opensource-linux-x64-5.14.0.run + wget https://download.qt.io/official_releases/qt/5.14/5.14.0/qt-opensource-linux-x64-5.14.0.run echo "4379f147c6793ec7e7349d2f9ee7d53b8ab6ea4e4edf8ee0574a75586a6a6e0e *qt-opensource-linux-x64-5.14.0.run" | shasum -a 256 --check chmod +x qt-opensource-linux-x64-5.14.0.run build-packages: