summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2016-06-10 17:29:44 -0700
committerMicah Lee <micah@micahflee.com>2016-06-10 17:29:44 -0700
commit900276a5242c6ba5fc876efd83b1f0fe122ade29 (patch)
tree96ac54a34bb0f06b3037857fa6a62746afb522d7
parent62e7035d3d605d4a55a671d894cd17b68b1f9245 (diff)
parent7a895d411759b18157979287f1929e6407c64062 (diff)
downloadonionshare-900276a5242c6ba5fc876efd83b1f0fe122ade29.tar.gz
onionshare-900276a5242c6ba5fc876efd83b1f0fe122ade29.zip
Merge branch 'PabloCastellano-master'
-rw-r--r--BUILD.md17
-rwxr-xr-xinstall/scripts/onionshare2
-rwxr-xr-xinstall/scripts/onionshare-gui2
3 files changed, 17 insertions, 4 deletions
diff --git a/BUILD.md b/BUILD.md
index ebb33df7..4fec1946 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -11,10 +11,23 @@ cd onionshare
*For .deb-based distros (like Debian, Ubuntu, Linux Mint):*
-Note that python3-stem appears in Debian wheezy and newer, and it appears in Ubuntu 13.10 and newer. Older versions of Debian and Ubuntu aren't supported.
+Then install the needed dependencies:
```sh
-sudo apt-get install -y build-essential fakeroot python3-all python3-stdeb python3-flask python3-stem python3-pyqt5 dh-python
+sudo apt-get install -y python3-flask python3-stem python3-pyqt5
+```
+
+After that you can try both the CLI and the GUI version of OnionShare:
+
+```sh
+./install/scripts/onionshare
+./install/scripts/onionshare-gui
+```
+
+A script to build a .deb package and install OnionShare easily is also provided for your convenience:
+
+```sh
+sudo apt-get install -y build-essential fakeroot python3-all python3-stdeb dh-python
./install/build_deb.sh
sudo dpkg -i deb_dist/onionshare_*.deb
```
diff --git a/install/scripts/onionshare b/install/scripts/onionshare
index 4d806f34..ed863e4f 100755
--- a/install/scripts/onionshare
+++ b/install/scripts/onionshare
@@ -23,7 +23,7 @@ import sys, os
try:
import onionshare
except ImportError:
- sys.path.append(os.path.abspath(os.path.dirname(__file__)+'/..'))
+ sys.path.append(os.path.abspath(os.path.dirname(__file__)+'/../..'))
import onionshare
onionshare.main()
diff --git a/install/scripts/onionshare-gui b/install/scripts/onionshare-gui
index 86dcf728..24a6f12b 100755
--- a/install/scripts/onionshare-gui
+++ b/install/scripts/onionshare-gui
@@ -23,7 +23,7 @@ import sys, os
try:
import onionshare_gui
except ImportError:
- sys.path.append(os.path.abspath(os.path.dirname(__file__)+'/..'))
+ sys.path.append(os.path.abspath(os.path.dirname(__file__)+'/../..'))
import onionshare_gui
onionshare_gui.main()