NixOS + home-manager configs, mirrored from GitLab SaaS.
gitlab.com/andreijiroh-dev/nixops-config
nix-flake
nixos
home-manager
nixpkgs
nix-flakes
chore(detect-vscode-for-git): simplify CLI path detection
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.dev>
+10
-25
+10
-25
misc/bash/lib/detect-vscode-for-git
+10
-25
misc/bash/lib/detect-vscode-for-git
···
16
16
if [[ "$VSCODE_GIT_IPC_HANDLE" != "" && "$VSCODE_GIT_ASKPASS_NODE" != "" && "$TERM_PROGRAM" == "vscode" ]]; then
17
17
__VSCODE_BASE_PATH="$(dirname "${VSCODE_GIT_ASKPASS_NODE}")"
18
18
log "Detected VS Code environment. Base path: ${__VSCODE_BASE_PATH}"
19
+
20
+
# If it is, set the path to the correct location
21
+
__VSCODE_STABLE_CLI_PATH="${__VSCODE_BASE_PATH}/bin/remote-cli/code"
22
+
__VSCODE_INSIDERS_CLI_PATH="${__VSCODE_BASE_PATH}/bin/remote-cli/code-insiders"
19
23
20
-
# Check if the path is in ~/.vscode/cli/servers (for Remote Tunnels), ~/.vscode-server/cli
21
-
# (for Remote SSH) or not
22
-
if [[ $__VSCODE_BASE_PATH =~ ^"$HOME"/.vscode/cli/servers ]] || [[ $__VSCODE_BASE_PATH =~ ^"$HOME"/.vscode-server/cli ]]; then
23
-
# If it is, set the path to the correct location
24
-
__VSCODE_STABLE_CLI_PATH="${__VSCODE_BASE_PATH}/bin/remote-cli/code"
25
-
__VSCODE_INSIDERS_CLI_PATH="${__VSCODE_BASE_PATH}/bin/remote-cli/code-insiders"
24
+
# Check if the stable or insiders version exists
25
+
if [[ -f "$__VSCODE_INSIDERS_CLI_PATH" ]]; then
26
+
VSCODE_CLI_PATH="$__VSCODE_INSIDERS_CLI_PATH"
27
+
elif [[ -f "$__VSCODE_STABLE_CLI_PATH" ]]; then
28
+
VSCODE_CLI_PATH="$__VSCODE_STABLE_CLI_PATH"
29
+
fi
26
30
27
-
# Check if the stable or insiders version exists
28
-
if [[ -f "$__VSCODE_INSIDERS_CLI_PATH" ]]; then
29
-
VSCODE_CLI_PATH="$__VSCODE_INSIDERS_CLI_PATH"
30
-
elif [[ -f "$__VSCODE_STABLE_CLI_PATH" ]]; then
31
-
VSCODE_CLI_PATH="$__VSCODE_STABLE_CLI_PATH"
32
-
fi
33
-
else
34
-
# otherwise just use plain cli/desktop app CLI
35
-
__VSCODE_STABLE_CLI_PATH="$(command -v code)"
36
-
__VSCODE_INSIDERS_CLI_PATH="$(command -v code-insiders)"
37
-
38
-
# Same with earlier
39
-
if [[ -f "$__VSCODE_INSIDERS_CLI_PATH" ]]; then
40
-
VSCODE_CLI_PATH="$__VSCODE_INSIDERS_CLI_PATH"
41
-
elif [[ -f "$__VSCODE_STABLE_CLI_PATH" ]]; then
42
-
VSCODE_CLI_PATH="$__VSCODE_STABLE_CLI_PATH"
43
-
fi
44
-
fi
45
31
log "Using VS Code CLI path: ${VSCODE_CLI_PATH}"
46
-
47
32
export GIT_EDITOR="${VSCODE_CLI_PATH} --wait" EDITOR="${VSCODE_CLI_PATH} --wait" VISUAL="${VSCODE_CLI_PATH} --wait" VSCODE_CLI_PATH
48
33
fi
49
34