Correctly test for interactive scripts

JeroenBoersma · Sep 4, 2018 · 0fd8c3d · 0fd8c3d
1 parent 595b96a
commit 0fd8c3d
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 8 deletions.
diff --git a/bin/dev b/bin/dev
@@ -17,6 +17,11 @@ init() {
 
     DEV_PHP='php70';
 
+    DEV_INTERACTIVE=false;
+    if [ -t "0" ] && [ -t "1" ]; then
+        DEV_INTERACTIVE=true;
+    fi
+
     DEV_SUDO='';
     if [ -z "`groups | grep docker`" ]; then
         DEV_SUDO='sudo';

diff --git a/bin/dev_command/blackfire b/bin/dev_command/blackfire
@@ -6,7 +6,9 @@ if [ $? -ne 0 ]; then
 fi
 
 dc service blackfireclient;
-dc opt '-T';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 dc opt "--no-deps";
 
 dc cmd blackfire "$@";

diff --git a/bin/dev_command/composer b/bin/dev_command/composer
@@ -1,7 +1,9 @@
 
 dc service ${DEV_PHP};
-dc opt '-T';
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 dc opt "-u $(id -u):$(id -g)"
 
 if [ -n "${DEV_PROJECTPATH}" ]; then

diff --git a/bin/dev_command/console b/bin/dev_command/console
@@ -7,10 +7,13 @@ if [ -n "${DEV_PROJECTPATH}" ]; then
     dc opt "-w /data/${DEV_PROJECTPATH}"
 fi
 
-if [ -z "$*" ]; then
-    # Interactive mode
+dc cmd "$@";
+if [ $# -lt 1 ]; then
     dc cmd bash -l;
-else
+fi
+
+if [ ! ${DEV_INTERACTIVE} ]; then
     dc opt '-T';
-    dc cmd "$@";
 fi
+
+
diff --git a/bin/dev_command/custom b/bin/dev_command/custom
@@ -2,6 +2,9 @@
 dc service ${DEV_PHP};
 dc opt "-u $(id -u):$(id -g)"
 dc opt "--no-deps";
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 if [ -n "${DEV_PROJECTPATH}" ]; then
     dc opt "-w /data/${DEV_PROJECTPATH}"

diff --git a/bin/dev_command/exec b/bin/dev_command/exec
@@ -1,5 +1,8 @@
 
 dc mode exec;
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 if [ "$1" == "php" ]; then
     dc service ${DEV_PHP};

diff --git a/bin/dev_command/git b/bin/dev_command/git
@@ -2,6 +2,9 @@
 dc service ${DEV_PHP};
 dc opt "-u $(id -u):$(id -g)"
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 if [ -n "${DEV_PROJECTPATH}" ]; then
     dc opt "-w /data/${DEV_PROJECTPATH}"

diff --git a/bin/dev_command/logs b/bin/dev_command/logs
@@ -1,4 +1,7 @@
 
 dc mode logs;
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 dc cmd "$@";
 
diff --git a/bin/dev_command/magerun b/bin/dev_command/magerun
@@ -2,6 +2,9 @@
 dc service ${DEV_PHP};
 dc opt "-u $(id -u):$(id -g)"
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 if [ -n "${DEV_PROJECTPATH}" ]; then
     dc opt "-w /data/${DEV_PROJECTPATH}"

diff --git a/bin/dev_command/magerun2 b/bin/dev_command/magerun2
@@ -2,6 +2,9 @@
 dc service ${DEV_PHP};
 dc opt "-u $(id -u):$(id -g)"
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 if [ -n "${DEV_PROJECTPATH}" ]; then
     dc opt "-w /data/${DEV_PROJECTPATH}"

diff --git a/bin/dev_command/myroot b/bin/dev_command/myroot
@@ -2,6 +2,9 @@
 dc yml build/dist/docker-compose-dbclient.yml;
 dc service dbclient;
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 dc cmd mysql "-h db -uroot -p${MYSQL_ROOT_PASSWORD} $@";
 
diff --git a/bin/dev_command/mysql b/bin/dev_command/mysql
@@ -2,6 +2,9 @@
 dc yml build/dist/docker-compose-dbclient.yml;
 dc service dbclient;
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 dc cmd mysql "-h db -u ${USER} $@";
 
diff --git a/bin/dev_command/mysqldump b/bin/dev_command/mysqldump
@@ -1,7 +1,9 @@
 
 dc yml build/dist/docker-compose-dbclient.yml;
-dc opt '-T';
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 dc service 'dbclient';
 dc cmd mysqldump "-h db -u ${USER} $@";

diff --git a/bin/dev_command/mytop b/bin/dev_command/mytop
@@ -2,6 +2,9 @@
 dc yml build/dist/docker-compose-mytop.yml;
 dc service mytop;
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 dc cmd "-h db -u ${USER} -dinformation_schema $@";
 
diff --git a/bin/dev_command/php b/bin/dev_command/php
@@ -1,7 +1,10 @@
 
 dc service ${DEV_PHP};
-dc opt "-u $(id -u):$(id -g)"
 dc opt "--no-deps";
+dc opt "-u $(id -u):$(id -g)"
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 if [ -n "${DEV_PROJECTPATH}" ]; then
     dc opt "-w /data/${DEV_PROJECTPATH}"

diff --git a/bin/dev_command/run b/bin/dev_command/run
@@ -2,6 +2,9 @@
 dc service $1;
 shift;
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 if [ -n "${DEV_PROJECTPATH}" ]; then
     dc opt "-w /data/${DEV_PROJECTPATH}"

diff --git a/bin/dev_command/top b/bin/dev_command/top
@@ -1,6 +1,9 @@
 
 dc yml build/dist/docker-compose-ctop.yml
 dc opt '--no-deps';
+if [ ! ${DEV_INTERACTIVE} ]; then
+    dc opt '-T';
+fi
 
 dc service ctop
 dc cmd -s cpu -f ${DEV_PROJECT}