forked from finn/tinyboard
add retry or abort prompt to all connection tests
This commit is contained in:
27
setup.sh
27
setup.sh
@@ -16,6 +16,25 @@ YELLOW='\033[1;33m'
|
||||
CYAN='\033[0;36m'
|
||||
NC='\033[0m'
|
||||
|
||||
retry_or_abort() {
|
||||
local test_cmd="$1"
|
||||
local fail_msg="$2"
|
||||
while true; do
|
||||
if eval "$test_cmd" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
echo ""
|
||||
warn "$fail_msg"
|
||||
echo -e " ${YELLOW}[R]${NC} Retry ${RED}[A]${NC} Abort"
|
||||
read -rp "Choice: " CHOICE
|
||||
case "${CHOICE,,}" in
|
||||
r) info "Retrying..." ;;
|
||||
a) die "Aborted." ;;
|
||||
*) warn "Press R to retry or A to abort." ;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
info() { echo -e "${GREEN}[+]${NC} $*"; }
|
||||
warn() { echo -e "${YELLOW}[!]${NC} $*"; }
|
||||
die() { echo -e "${RED}[ERROR]${NC} $*" >&2; exit 1; }
|
||||
@@ -107,11 +126,9 @@ sudo -u armbian ssh-keyscan -H "$HUB_HOST" >> "$SSH_DIR/known_hosts" 2>/dev/null
|
||||
|
||||
header "Testing SSH Connection"
|
||||
info "Testing connection to $HUB_HOST..."
|
||||
if sudo -u armbian ssh -i "$KEY_PATH" -o BatchMode=yes -o ConnectTimeout=10 "$HUB_USER@$HUB_HOST" exit 2>/dev/null; then
|
||||
info "SSH connection successful."
|
||||
else
|
||||
die "SSH connection to $HUB_HOST failed. Check that finn added your public key."
|
||||
fi
|
||||
retry_or_abort \
|
||||
"sudo -u armbian ssh -i \"$KEY_PATH\" -o BatchMode=yes -o ConnectTimeout=10 \"$HUB_USER@$HUB_HOST\" exit" \
|
||||
"SSH connection to $HUB_HOST failed. Check that finn added your public key."
|
||||
|
||||
header "Finding Available Tunnel Port"
|
||||
info "Scanning for a free port on $HUB_HOST starting from $START_PORT..."
|
||||
|
||||
Reference in New Issue
Block a user