Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-09-27 19:41:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1111_snap' into briefcase-snap

Browse source
This commit is contained in:
Micah Lee 2020-11-03 19:37:05 -08:00
commit 3cef5c1679
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
6 changed files with 168 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

34
desktop/README.md
View file

@ -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:

23
desktop/install/scripts/onionshare
View file

@ -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()

23
desktop/install/scripts/onionshare-gui
View file

@ -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()

47
desktop/install/scripts/onionshare-pyinstaller
View file

@ -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()