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

onionshare/onionshare.py

@@ -17,7 +17,7 @@ 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 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
 
 from stem.control import Controller
@@ -208,6 +208,9 @@ class OnionShare(object):
             except urllib2.HTTPError:  # Tails error
                 sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope')))
                 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:
                 return False
         return True

tails/install_in_persistent_volume.sh

@@ -16,7 +16,7 @@ mkdir -p $INSTALL_DIR
 # install dependencies
 apt-get update
 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
 cp deb_dist/onionshare_*.deb $INSTALL_DIR