Merge branch 'master' into 'master'

[fdroidserver.git] / buildserver / setup-env-vars

diff --git a/buildserver/setup-env-vars b/buildserver/setup-env-vars
index 83d433eb0f958783d52db70795afdc0014741a2b..66e3d7e6452220d23a00acad2657d1e0719665e5 100644 (file)
--- a/buildserver/setup-env-vars
+++ b/buildserver/setup-env-vars
@@ -10,7 +10,10 @@ bsenv=/etc/profile.d/bsenv.sh
 echo "# generated on "`date` > $bsenv
 
 echo export ANDROID_HOME=$1 >> $bsenv
-echo export ANDROID_NDK_HOME=$2 >> $bsenv
 echo 'export PATH=$PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:/opt/gradle/bin' >> $bsenv
 
 chmod 0644 $bsenv
+
+# make sure that SSH never hangs at a password or key prompt
+printf '    StrictHostKeyChecking yes' >> /etc/ssh/ssh_config
+printf '    BatchMode yes' >> /etc/ssh/config