Skip to content

Commit

Permalink
fix: store contents of config in variable
Browse files Browse the repository at this point in the history
  • Loading branch information
simonwjackson committed Apr 13, 2024
1 parent ea57c1f commit 8fb0681
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/bin/tmesh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TMUX="${TMUX:-}"
TERM="${TERM:-}"
SERVER="${SERVER:=$(hostname)}"
SCRIPT_DIR="$(dirname "$0")"
TMUX_CONFIG=${TMUX_CONFIG:="/etc/tmesh/tmesh.tmux.conf"}
TMUX_CONFIG=${TMUX_CONFIG:=$(cat /etc/tmesh/tmesh.tmux.conf)}
export TMESH_SOCKET=${TMESH_SOCKET:-"tmesh"}

read -r -d '' tmesh_default_config <<EOM
Expand Down
2 changes: 1 addition & 1 deletion src/bin/tmesh-server
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

SCRIPT_DIR="$(dirname "$0")"
TMESH_SERVER_SOCKET=${TMESH_SERVER_SOCKET:-"tmesh-server"}
TMUX_CONFIG=${TMUX_CONFIG:="/etc/tmesh/tmesh-server.tmux.conf"}
TMUX_CONFIG=${TMUX_CONFIG:=$(cat /etc/tmesh/tmesh-server.tmux.conf)}
TMESH_CONFIG=${TMESH_CONFIG:="/etc/tmesh/config.json"}

command="$(yq -e -oy '.local-tmesh-server.command' "${TMESH_CONFIG}" 2>/dev/null || echo "${SHELL}")"
Expand Down

0 comments on commit 8fb0681

Please sign in to comment.