summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2016-09-04 19:57:34 -0700
committerMicah Lee <micah@micahflee.com>2016-09-04 19:57:34 -0700
commit4ce64ed83ef6b4a8db489372c209c78bce000b7c (patch)
tree08bd2195acc18de5bef43cd0fe5e43732809f4ce
parent8e8ea9c357ca0aab9f3840141692d4c83f2a17b9 (diff)
downloadonionshare-4ce64ed83ef6b4a8db489372c209c78bce000b7c.tar.gz
onionshare-4ce64ed83ef6b4a8db489372c209c78bce000b7c.zip
Make launcher scripts require onionshare and onionshare_gui python packages to be installed, to workaround a cx_Freeze issue
-rwxr-xr-xinstall/scripts/onionshare9
-rwxr-xr-xinstall/scripts/onionshare-gui9
2 files changed, 2 insertions, 16 deletions
diff --git a/install/scripts/onionshare b/install/scripts/onionshare
index ed863e4f..a896d597 100755
--- a/install/scripts/onionshare
+++ b/install/scripts/onionshare
@@ -18,12 +18,5 @@ 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
-
-try:
- import onionshare
-except ImportError:
- sys.path.append(os.path.abspath(os.path.dirname(__file__)+'/../..'))
- import onionshare
-
+import onionshare
onionshare.main()
diff --git a/install/scripts/onionshare-gui b/install/scripts/onionshare-gui
index 24a6f12b..6ccdd00b 100755
--- a/install/scripts/onionshare-gui
+++ b/install/scripts/onionshare-gui
@@ -18,12 +18,5 @@ 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
-
-try:
- import onionshare_gui
-except ImportError:
- sys.path.append(os.path.abspath(os.path.dirname(__file__)+'/../..'))
- import onionshare_gui
-
+import onionshare_gui
onionshare_gui.main()