Handle display forwarding better

1 files changed, 27 insertions, 7 deletions

diff --git a/datastudio/run b/datastudio/run
index 00212fa..ec07fb9 100755
--- a/datastudio/run
+++ b/datastudio/run
@@ -1,10 +1,30 @@
 #!/bin/bash
 
+if [ -z "$DISPLAY" ]; then
+    echo "\$DISPLAY is not set"
+    DISPLAYS=( $(netstat -lnt | awk '/127.0.0.1:60/ { split($4,a,":"); print "localhost:" substr(a[2],3) ".0" }') )
+
+    if [ "${#DISPLAYS[@]}" = 0 ]; then
+        echo "No X11 ports available"
+        exit 1
+    fi
+
+    if [ "${#DISPLAYS[@]}" > 1 ]; then
+        echo "More than 1 X11 port available. Which one do you want?"
+        for i in "${DISPLAYS[@]}"; do
+            echo "export DISPLAY=\"$i\""
+        done
+        exit 1
+    else
+        export DISPLAY="${DISPLAYS[0]}"
+    fi
+fi
+
 docker run -ti --rm --net=host \
-           -e DISPLAY=$DISPLAY \
-           -e XAUTHORITY=/hosthome/.Xauthority \
-           -v /etc/localtime:/etc/localtime:ro \
-           -v $HOME:/hosthome:ro \
-           -v $HOME/share:$HOME/share \
-           -v $HOME/.datastudio:$HOME/.datastudio \
-           datastudio "$@"
+    -e DISPLAY \
+    -e XAUTHORITY=$HOME/.Xauthority \
+    -v /usr/share/zoneinfo/America/Los_Angeles:/etc/localtime:ro \
+    -v $HOME/.Xauthority:$HOME/.Xauthority:ro \
+    -v $HOME/share:$HOME/share \
+    -v $HOME/.datastudio:$HOME/.datastudio \
+    datastudio "$@"