fix: restore fzf dependency check and clean ssh menu script
This commit is contained in:
+6
-22
@@ -56,10 +56,10 @@ dependency_check() {
|
||||
printf 'Error: ssh is required but not installed.\n' >&2
|
||||
exit 1
|
||||
fi
|
||||
#if command -v fzf >/dev/null 2>&1; then
|
||||
# printf 'Error: fzf is required but not installed.\n' >&2
|
||||
# exit 1
|
||||
#fi
|
||||
if command -v fzf >/dev/null 2>&1; then
|
||||
printf 'Error: fzf is required but not installed.\n' >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
dependency_check
|
||||
|
||||
@@ -87,7 +87,6 @@ load_config() {
|
||||
GROUP_NAME=${GROUP_NAME%.*}
|
||||
GROUP_NAME=$(yq -r '.group // "'"$GROUP_NAME"'"' <<<"$FILE_CONTENT")
|
||||
GROUP_SERVERS=$(yq -r '.servers // []' <<<"$FILE_CONTENT")
|
||||
#echo "$GROUP_NAME"
|
||||
INDEX=0
|
||||
|
||||
for ((i=0; i<$(jq -r '. | length' <<<"$GROUP_SERVERS"); i++)); do
|
||||
@@ -97,25 +96,10 @@ load_config() {
|
||||
SSH_SERVER_HOST=$(jq -r '.'"[$i]"'.host // ""' <<<"$GROUP_SERVERS")
|
||||
SSH_SERVER_PORT=$(jq -r '.'"[$i]"'.port // "'"$DEFAULT_SSH_PORT"'"' <<<"$GROUP_SERVERS")
|
||||
SSH_SERVER_USER=$(jq -r '.'"[$i]"'.port // "'"$DEFAULT_SSH_USER"'"' <<<"$GROUP_SERVERS")
|
||||
#SSH_JUMP_HOST=$(jq -r '.'"[$i]"'.jump_host // ""' <<<"$GROUP_SERVERS")
|
||||
#if [ "$SSH_JUMP_HOST" != "" ]; then
|
||||
# SSH_JUMP_HOST=$(jq -r '.yverdon // ""' <<<"$SSH_JUMP_HOSTS")
|
||||
#fi
|
||||
#SSH_OPTIONS=$(jq -r '.'"[$i]"'.options // ""' <<<"$GROUP_SERVERS")
|
||||
|
||||
if [ "$SSH_SERVER_ALIASES" != "" ]; then
|
||||
# shellcheck disable=SC2027
|
||||
ALIASES="("$(echo "$SSH_SERVER_ALIASES" | jq -r 'join(", ")')")"
|
||||
#echo "$SSH_SERVER_NAME $ALIASES"
|
||||
#else
|
||||
# echo "$SSH_SERVER_NAME"
|
||||
fi
|
||||
#if [ "$SSH_JUMP_HOST" == "" ]; then
|
||||
# echo "$SSH_SERVER_USER@$SSH_SERVER_HOST:$SSH_SERVER_PORT"
|
||||
#else
|
||||
# echo "$SSH_SERVER_USER@$SSH_SERVER_HOST:$SSH_SERVER_PORT via $SSH_JUMP_HOST"
|
||||
#fi
|
||||
#echo "$SSH_OPTIONS"
|
||||
#echo '{ "name": "'"$SSH_SERVER_NAME"'" }' | jq
|
||||
if [ "$SERVERS" != "" ]; then
|
||||
SERVERS+="\n"
|
||||
fi
|
||||
@@ -125,7 +109,6 @@ load_config() {
|
||||
|
||||
done
|
||||
shopt -u nullglob
|
||||
|
||||
}
|
||||
popup_menu() {
|
||||
local SERVER
|
||||
@@ -151,6 +134,7 @@ ssh_connect() {
|
||||
fi
|
||||
|
||||
echo "ssh ${SSH_SERVER_OPTIONS} ${SSH_JUMP_HOST} ${SSH_SERVER_USER}@${SSH_SERVER_HOST}"
|
||||
# shellcheck disable=SC2086
|
||||
ssh ${SSH_SERVER_OPTIONS} ${SSH_JUMP_HOST} "${SSH_SERVER_USER}"@"${SSH_SERVER_HOST}"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user