fix: reintroduce default mosh command

simonwjackson · Apr 11, 2024 · 9a1743d · 9a1743d
1 parent 7dc96f4
commit 9a1743d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/bin/tmesh b/src/bin/tmesh
@@ -59,9 +59,8 @@ tryStartTmesh() {
       -L "${TMESH_SOCKET}" \
       new-session \
       -s "${TMESH_DEFAULT_SESSION}" \
-      -d
-    # \
-    # mosh "${SERVER}" -- sh -c "TMESH_SOCKET=$TMESH_SOCKET ${SCRIPT_DIR}/tmesh-server"
+      -d \
+      mosh "${SERVER}" -- sh -c "${SCRIPT_DIR}/tmesh-server"
   fi
 }
 

diff --git a/src/bin/tmesh-server b/src/bin/tmesh-server
@@ -1,19 +1,18 @@
 #!/usr/bin/env bash
 
 SCRIPT_DIR="$(dirname "$0")"
-TMESH_SERVER_INSTANCE_SOCKET=${TMESH_SERVER_INSTANCE_SOCKET:-"workspace"}
+TMESH_SERVER_SOCKET=${TMESH_SERVER_SOCKET:-"workspace"}
 TMUX_CONFIG=${TMUX_CONFIG:="${SCRIPT_DIR}/../etc/tmesh/tmesh-server.tmux.conf"}
-TMESH_CONFIG=${TMESH_CONFIG:="/etc/tmesh/config.json"}
 
 COMMAND="$(yq -e '.local-tmesh-server.command' ./config.yaml 2>/dev/null || echo "${SHELL}")"
 
 tmux \
-  -L "${TMESH_SERVER_INSTANCE_SOCKET}" \
+  -L "${TMESH_SERVER_SOCKET}" \
   -f "${TMUX_CONFIG}" \
   attach-session \
   -t terminals ||
   tmux \
-    -L "${TMESH_SERVER_INSTANCE_SOCKET}" \
+    -L "${TMESH_SERVER_SOCKET}" \
     -f "${TMUX_CONFIG}" \
     new-session \
     -s terminals \