2 Commits
Author SHA1 Message Date
matmoul c942d95ec6 fix: reset aliases when loading each server 2026-06-01 00:53:06 +02:00
matmoul ba7df89340 fix: default known-hosts user to current user 2026-06-01 00:22:51 +02:00
+3 -3
View File
@@ -3,7 +3,7 @@ set -euo pipefail
CONFIG_DIR="$HOME/.config/mtm-ssh-menu" CONFIG_DIR="$HOME/.config/mtm-ssh-menu"
USE_KNOWN_HOSTS=0 USE_KNOWN_HOSTS=0
USE_KNOWN_HOSTS_USER="root" USE_KNOWN_HOSTS_USER=$(whoami)
usage() { usage() {
cat <<'EOF' cat <<'EOF'
@@ -34,7 +34,6 @@ parse_args() {
--known-hosts|-k) --known-hosts|-k)
USE_KNOWN_HOSTS=1 USE_KNOWN_HOSTS=1
if [ $# -eq 1 ]; then if [ $# -eq 1 ]; then
USE_KNOWN_HOSTS_USER="root"
shift shift
else else
USE_KNOWN_HOSTS_USER="$2" USE_KNOWN_HOSTS_USER="$2"
@@ -108,6 +107,7 @@ load_config() {
SSH_SERVER_HOST=$(jq -r '.'"[$i]"'.host // ""' <<<"$GROUP_SERVERS") SSH_SERVER_HOST=$(jq -r '.'"[$i]"'.host // ""' <<<"$GROUP_SERVERS")
SSH_SERVER_PORT=$(jq -r '.'"[$i]"'.port // "'"$DEFAULT_SSH_PORT"'"' <<<"$GROUP_SERVERS") SSH_SERVER_PORT=$(jq -r '.'"[$i]"'.port // "'"$DEFAULT_SSH_PORT"'"' <<<"$GROUP_SERVERS")
SSH_SERVER_USER=$(jq -r '.'"[$i]"'.user // "'"$DEFAULT_SSH_USER"'"' <<<"$GROUP_SERVERS") SSH_SERVER_USER=$(jq -r '.'"[$i]"'.user // "'"$DEFAULT_SSH_USER"'"' <<<"$GROUP_SERVERS")
ALIASES=""
if [ "$SSH_SERVER_ALIASES" != "" ]; then if [ "$SSH_SERVER_ALIASES" != "" ]; then
# shellcheck disable=SC2027 # shellcheck disable=SC2027
ALIASES="("$(echo "$SSH_SERVER_ALIASES" | jq -r 'join(", ")')")" ALIASES="("$(echo "$SSH_SERVER_ALIASES" | jq -r 'join(", ")')")"
@@ -165,10 +165,10 @@ ssh_connect() {
} }
main() { main() {
load_config
if [ "$USE_KNOWN_HOSTS" == 1 ]; then if [ "$USE_KNOWN_HOSTS" == 1 ]; then
load_known_hosts load_known_hosts
fi fi
load_config
popup_menu popup_menu
} }