X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dssh;h=9799ec0c3f9153cec8e14371f9445d19934281b9;hb=ef32118a10785fe6792d3bad1d4b11590460bffe;hp=7540c8b364fac1b0349901c10988cf5ce303fb15;hpb=8618f68137593b789ec5a30b95b97f2170fea046;p=cmccabe-bin

diff --git a/dssh b/dssh
index 7540c8b..9799ec0 100755
--- a/dssh
+++ b/dssh
@@ -48,11 +48,7 @@ shift $(expr $OPTIND - 1)
 if [ $# -eq 0 ]; then
     RUN_COMMAND="/bin/bash"
 else
-    RUN_COMMAND="${@}"
-fi
-EXTRA_DOCKER_ARGS=""
-if [ ${ALLOCATE_TTY} -ne 0 ]; then
-    EXTRA_DOCKER_ARGS="${EXTRA_DOCKER_ARGS} -t"
+    RUN_COMMAND=""
 fi
 
 which docker &>/dev/null || die "docker must be on the PATH."
@@ -74,4 +70,9 @@ else
         die "failed to find a docker image named ${DOCKER_IMAGE_NAME}"
 fi
 
-docker exec -i ${EXTRA_DOCKER_ARGS} "${DOCKER_IMAGE_ID}" ${RUN_COMMAND}
+if [ ${ALLOCATE_TTY} == 1 ]; then
+    docker exec -it "${DOCKER_IMAGE_ID}" "${@}" ${RUN_COMMAND}
+else
+    docker exec -i "${DOCKER_IMAGE_ID}" "${@}" ${RUN_COMMAND} &
+    wait
+fi