Both test on one line

LibrIT · Nov 4, 2019 · 286a0fb · 286a0fb
1 parent 7372ec3
commit 286a0fb
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/passhport/passhport-connect.sh b/passhport/passhport-connect.sh
@@ -44,14 +44,9 @@ else
     wget --ca-certificate=${CERT} -qO - ${URL}connection/ssh/endsession/${PID} &> /dev/null
 fi
 
-# If it's a direct connection, we don't connect again
-if [ "${SSH_ORIGINAL_COMMAND}" != "" ]
-then 
-    KEEPCONNECT=0
-fi
-
 # Launch PaSSHport with the same user after the connection
-if [ "${KEEPCONNECT}" -eq "1" ]
+# If it's a direct connection, we don't connect again
+if [ "${KEEPCONNECT}" -eq "1" ] && [ -z "${SSH_ORIGINAL_COMMAND}" ]
 then
     ${PYTHONBIN} ${PASSHPORTBIN} ${USERNAME} 
 fi