Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-01 02:36:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:micahflee/onionshare

Browse Source
This commit is contained in:
Micah Lee 2015-05-18 15:53:10 -07:00
commit c0f049bcff
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
onionshare/onionshare.py
View File

@ -17,7 +17,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2, tempfile import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2, httplib, tempfile
import socks import socks
from stem.control import Controller from stem.control import Controller
@ -208,6 +208,9 @@ class OnionShare(object):
except urllib2.HTTPError: # Tails error except urllib2.HTTPError: # Tails error
sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope'))) sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope')))
sys.stdout.flush() sys.stdout.flush()
except httplib.BadStatusLine: # Tails (with bridge) error
sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope')))
sys.stdout.flush()
except KeyboardInterrupt: except KeyboardInterrupt:
return False return False
return True return True

2
tails/install_in_persistent_volume.sh
View File

@ -16,7 +16,7 @@ mkdir -p $INSTALL_DIR
# install dependencies # install dependencies
apt-get update apt-get update
apt-get install -y build-essential fakeroot python-all python-stdeb python-flask python-stem python-qt4 python-socksipy apt-get install -y build-essential fakeroot python-all python-stdeb python-flask python-stem python-qt4 python-socksipy
./build_deb.sh ./install/build_deb.sh
# copy files # copy files
cp deb_dist/onionshare_*.deb $INSTALL_DIR cp deb_dist/onionshare_*.deb $INSTALL_DIR