[tor-commits] [ooni-probe/master] Fix conditionals, move echo output

[art@xxxxxxxxxxxxxx]

commit 20fae977f9b905561435e9d64fa14eefd0edfa00
Author: anadahz <kojgelo@xxxxxxxxx>
Date:   Wed Nov 18 19:33:52 2015 +0100

    Fix conditionals, move echo output
---
 scripts/psiphon_install.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/psiphon_install.sh b/scripts/psiphon_install.sh
index e5b2a78..9a1431d 100755
--- a/scripts/psiphon_install.sh
+++ b/scripts/psiphon_install.sh
@@ -33,17 +33,18 @@ fi
 echo "installing dependencies"
 $sh_c "apt-get -y install zlib1g-dev libssl-dev"
 
-if [ -z "command_exists hg" ]; then
+if [ ! "command_exists hg" ]; then
   $sh_c "apt-get -y install mercurial"
 fi
 
-echo "cloning psiphon repository"
 cd $PSIPHON_PATH
 if [ ! -d "psiphon-circumvention-system" ]; then
+  echo "cloning psiphon repository"
   hg clone $PSIPHON_REPO_URL
-  echo "psiphon repository cloned"
 fi
 
+echo "psiphon repository cloned"
+
 # optional, compile their ssh
 if [ ! -f "$PSIPHON_PYCLIENT_PATH/ssh" ]; then
     echo "compiling psiphon ssh"
@@ -61,7 +62,7 @@ if [ `python -c 'import sys; print hasattr(sys, "real_prefix")'` = "False" ]; th
   # not in a virtualenv
   # create a virtualenv
   # FIXME: assuming debian version will have secure pip/virtualenv
-  if [ -z "command_exists virtualenv" ]; then
+  if [ ! "command_exists virtualenv" ]; then
     $sh_c "apt-get -y install python-virtualenv"
   fi
   if [ ! -f $OONI_VIRTUALENV_PATH/bin/activate ]; then



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits