Merge branch '1111_snap' into briefcase-snap

4 files changed, 34 insertions, 93 deletions

diff --git a/desktop/README.md b/desktop/README.md
index cf3c4113..7d816b16 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -95,6 +95,40 @@ xvfb-run ./tests/run.sh
 
 ## Making a release
 
+### Flatpak packaging
+
+See: https://github.com/micahflee/org.onionshare.OnionShare
+
+### Snapcraft packaging
+
+This folder contains files to build a [snap package](https://snapcraft.io/). First make sure you install `snap` and `snapcraft` (`snap install snapcraft --classic`).
+
+To build the snap, cd to the `onionshare` folder and run:
+
+```sh
+snapcraft
+snap install --devmode ./onionshare_*.snap
+```
+
+See your installed snaps:
+
+```sh
+snap list
+```
+
+Run the OnionShare snap:
+
+```sh
+/snap/bin/onionshare                # CLI version
+/snap/bin/onionshare.onionshare-gui # GUI version
+```
+
+Delete the OnionShare snap:
+
+```sh
+snap remove onionshare
+```
+
 ### Linux
 
 Build a wheel package for OnionShare CLI:
diff --git a/desktop/install/scripts/onionshare b/desktop/install/scripts/onionshare
deleted file mode 100755
index 67298b6f..00000000
--- a/desktop/install/scripts/onionshare
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2014-2020 Micah Lee, et al. <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()
diff --git a/desktop/install/scripts/onionshare-gui b/desktop/install/scripts/onionshare-gui
deleted file mode 100755
index f1d36a86..00000000
--- a/desktop/install/scripts/onionshare-gui
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2014-2020 Micah Lee, et al. <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()
diff --git a/desktop/install/scripts/onionshare-pyinstaller b/desktop/install/scripts/onionshare-pyinstaller
deleted file mode 100644
index 8ca791aa..00000000
--- a/desktop/install/scripts/onionshare-pyinstaller
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-OnionShare | https://onionshare.org/
-
-Copyright (C) 2014-2020 Micah Lee, et al. <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 sys, os, platform
-
-# In macOS, allow both CLI and GUI depending on the filename of the binary
-# being executed
-if platform.system() == "Darwin":
-    # If the binary being executed is called 'onionshare', use CLI
-    basename = os.path.basename(sys.argv[0])
-    if basename == "onionshare":
-        import onionshare
-
-        onionshare.main()
-
-    # Otherwise, use GUI
-    else:
-        import onionshare_gui
-
-        onionshare_gui.main()
-
-# Unfortunately this trick won't work in Windows because I want to set
-# console=False in the PyInstaller spec file, so there isn't a command prompt
-# open in the background every you run the GUI. Hopefully Windows can get
-# a built-in CLI when PyInstaller 3.3 comes out:
-# https://pyinstaller.readthedocs.io/en/stable/spec-files.html#multipackage-bundles
-else:
-    import onionshare_gui
-
-    onionshare_gui.main()