aboutsummaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-08-27 19:13:08 -0400
committerMicah Lee <micah@micahflee.com>2020-08-27 19:13:08 -0400
commit4c4323a772c56c6fc38ed5ec99868ba2ce82285d (patch)
tree4679af536b2ee057f67123c36814427175b7924b /install
parentdc6cefd7ce0d732667163273871a0b93ce62ea3b (diff)
downloadonionshare-4c4323a772c56c6fc38ed5ec99868ba2ce82285d.tar.gz
onionshare-4c4323a772c56c6fc38ed5ec99868ba2ce82285d.zip
Update Copyright to 2020 everywhere, and assign to Micah Lee, et al. instead of just Micah Lee
Diffstat (limited to 'install')
-rw-r--r--install/get-tor-osx.py2
-rw-r--r--install/get-tor-windows.py2
-rw-r--r--install/org.onionshare.OnionShare.appdata.xml1
-rwxr-xr-xinstall/scripts/onionshare3
-rwxr-xr-xinstall/scripts/onionshare-gui3
-rw-r--r--install/scripts/onionshare-pyinstaller9
6 files changed, 12 insertions, 8 deletions
diff --git a/install/get-tor-osx.py b/install/get-tor-osx.py
index c68a81a6..073384d7 100644
--- a/install/get-tor-osx.py
+++ b/install/get-tor-osx.py
@@ -2,7 +2,7 @@
"""
OnionShare | https://onionshare.org/
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
+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
diff --git a/install/get-tor-windows.py b/install/get-tor-windows.py
index 99608706..07811880 100644
--- a/install/get-tor-windows.py
+++ b/install/get-tor-windows.py
@@ -2,7 +2,7 @@
"""
OnionShare | https://onionshare.org/
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
+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
diff --git a/install/org.onionshare.OnionShare.appdata.xml b/install/org.onionshare.OnionShare.appdata.xml
index 3ba2a51a..9fecb922 100644
--- a/install/org.onionshare.OnionShare.appdata.xml
+++ b/install/org.onionshare.OnionShare.appdata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2018 Micah Lee <micah@micahflee.com> -->
<component type="desktop-application">
<id>org.onionshare.OnionShare</id>
<metadata_license>CC0-1.0</metadata_license>
diff --git a/install/scripts/onionshare b/install/scripts/onionshare
index e2205e04..67298b6f 100755
--- a/install/scripts/onionshare
+++ b/install/scripts/onionshare
@@ -3,7 +3,7 @@
"""
OnionShare | https://onionshare.org/
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
+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
@@ -19,4 +19,5 @@ 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/install/scripts/onionshare-gui b/install/scripts/onionshare-gui
index fed29d83..f1d36a86 100755
--- a/install/scripts/onionshare-gui
+++ b/install/scripts/onionshare-gui
@@ -3,7 +3,7 @@
"""
OnionShare | https://onionshare.org/
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
+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
@@ -19,4 +19,5 @@ 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/install/scripts/onionshare-pyinstaller b/install/scripts/onionshare-pyinstaller
index bd59b421..8ca791aa 100644
--- a/install/scripts/onionshare-pyinstaller
+++ b/install/scripts/onionshare-pyinstaller
@@ -3,7 +3,7 @@
"""
OnionShare | https://onionshare.org/
-Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
+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
@@ -22,16 +22,18 @@ 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 platform.system() == "Darwin":
# If the binary being executed is called 'onionshare', use CLI
basename = os.path.basename(sys.argv[0])
- if basename == 'onionshare':
+ 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
@@ -41,4 +43,5 @@ if platform.system() == 'Darwin':
# https://pyinstaller.readthedocs.io/en/stable/spec-files.html#multipackage-bundles
else:
import onionshare_gui
+
onionshare_gui.main()