mirror of
https://github.com/aleleba/aleleba-vscode-dockerfile-configuration.git
synced 2025-04-19 22:27:48 -06:00
Trying to fix existing tunnel.
This commit is contained in:
parent
0fe46e635d
commit
aa9afba282
@ -159,8 +159,40 @@ fi
|
|||||||
|
|
||||||
# Check if CLI directory exists and has content
|
# Check if CLI directory exists and has content
|
||||||
if [ -d "/home/${HOME_USER}/.vscode/cli" ] && [ "$(ls -A /home/${HOME_USER}/.vscode/cli 2>/dev/null)" ]; then
|
if [ -d "/home/${HOME_USER}/.vscode/cli" ] && [ "$(ls -A /home/${HOME_USER}/.vscode/cli 2>/dev/null)" ]; then
|
||||||
# CLI directory exists and has content, use cli data
|
# CLI directory exists and has content, extract token and tunnel information
|
||||||
sudo su ${HOME_USER} -c "code tunnel --cli-data-dir /home/${HOME_USER}/.vscode/cli"
|
|
||||||
|
# Extract token from token.json if it exists
|
||||||
|
TOKEN_FILE="/home/${HOME_USER}/.vscode/cli/token.json"
|
||||||
|
if [ -f "$TOKEN_FILE" ]; then
|
||||||
|
TOKEN=$(cat "$TOKEN_FILE" | tr -d '\n')
|
||||||
|
else
|
||||||
|
TOKEN=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Extract id and cluster from code_tunnel.json if it exists
|
||||||
|
TUNNEL_FILE="/home/${HOME_USER}/.vscode/cli/code_tunnel.json"
|
||||||
|
if [ -f "$TUNNEL_FILE" ]; then
|
||||||
|
if command -v jq &> /dev/null; then
|
||||||
|
# Use jq if available
|
||||||
|
ID=$(jq -r '.id' "$TUNNEL_FILE")
|
||||||
|
CLUSTER=$(jq -r '.cluster' "$TUNNEL_FILE")
|
||||||
|
else
|
||||||
|
# Fallback to grep and cut if jq is not available
|
||||||
|
ID=$(grep -o '"id"[^,}]*' "$TUNNEL_FILE" | cut -d'"' -f4)
|
||||||
|
CLUSTER=$(grep -o '"cluster"[^,}]*' "$TUNNEL_FILE" | cut -d'"' -f4)
|
||||||
|
fi
|
||||||
|
TUNNEL_ID="${ID}.${CLUSTER}"
|
||||||
|
else
|
||||||
|
TUNNEL_ID=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create tunnel with extracted values if available
|
||||||
|
if [ -n "$TOKEN" ] && [ -n "$TUNNEL_ID" ]; then
|
||||||
|
sudo su ${HOME_USER} -c "code tunnel --name ${VSCODE_TUNNEL_NAME} --tunnel-id ${TUNNEL_ID}--host-token ${TOKEN}"
|
||||||
|
else
|
||||||
|
# Fallback to simpler command if values couldn't be extracted
|
||||||
|
sudo su ${HOME_USER} -c "code tunnel --name ${VSCODE_TUNNEL_NAME}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
# No CLI directory or empty, use normal startup
|
# No CLI directory or empty, use normal startup
|
||||||
if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then
|
if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then
|
||||||
|
@ -1 +1 @@
|
|||||||
3.2.3
|
3.2.4
|
||||||
|
Loading…
Reference in New Issue
Block a user