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

@@ -1,22 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
-
-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 <http://www.gnu.org/licenses/>.
-"""
-import onionshare
-onionshare.main()

install/scripts/onionshare-gui

@@ -1,22 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
-
-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 <http://www.gnu.org/licenses/>.
-"""
-import onionshare_gui
-onionshare_gui.main()

setup.py

@@ -97,7 +97,11 @@ setup(
         "onionshare_gui.tab.mode.receive_mode",
         "onionshare_gui.tab.mode.website_mode",
     ],
-    # include_package_data=True,
+    entry_points={
-    scripts=["install/scripts/onionshare", "install/scripts/onionshare-gui"],
+        "console_scripts": [
+            "onionshare = onionshare:main",
+            "onionshare-gui = onionshare_gui:main",
+        ],
+    },
     data_files=data_files,
 )

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:
+  onionshare:
-  #   common-id: org.onionshare.OnionShare
+    common-id: org.onionshare.OnionShare
-  #   command: onionshare
+    command: onionshare
-  #   plugs:
+    plugs:
-  #     - home
+      - home
-  #     - network
+      - network
-  #     - network-bind
+      - 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 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
       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: