termux-connecting 1.1.12 → 1.1.13

package/bin/termux-connect-pc

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-VERSION="1.1.12"
+VERSION="1.1.13"
 CONFIG_DIR="$HOME/.config/termux-connecting"
 CONFIG_FILE="$CONFIG_DIR/config"
 SSH_PORT=8022

package/bin/termux-connecting

@@ -1,18 +1,28 @@
 #!/data/data/com.termux/files/usr/bin/bash
-
 set -e
 
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-RED='\033[0;31m'
-CYAN='\033[0;36m'
-NC='\033[0m'
-
+GREEN='\033[0;32m'; YELLOW='\033[1;33m'; RED='\033[0;31m'; CYAN='\033[0;36m'; NC='\033[0m'
 info()  { echo -e "${GREEN}[✓]${NC} $1"; }
 warn()  { echo -e "${YELLOW}[!]${NC} $1"; }
 error() { echo -e "${RED}[✗]${NC} $1"; }
 title() { echo -e "\n${CYAN}━━━ $1 ━━━${NC}\n"; }
 
+AUTO=false
+for arg in "$@"; do
+    [ "$arg" = "-y" ] && AUTO=true
+done
+
+confirm() {
+    local msg="$1" default="$2"
+    $AUTO && return 0
+    local dprompt="y/N"
+    [ "$default" = "y" ] && dprompt="Y/n"
+    echo -n "  ${msg}? [${dprompt}]: "
+    read -r ans
+    local ans="${ans:-$default}"
+    [[ "$ans" =~ ^[Yy]$ ]] && return 0 || return 1
+}
+
 WELCOME_FILE="$HOME/.config/termux-connecting/.welcomed"
 if [ ! -f "$WELCOME_FILE" ]; then
     echo ""
@@ -35,91 +45,97 @@ if [ ! -f "$WELCOME_FILE" ]; then
     echo "  termux-connect-pc help          Bantuan"
     echo "  termux-connect-pc version       Versi"
     echo ""
+    echo -e "${YELLOW}Gunakan -y untuk skip semua konfirmasi: termux-connecting -y${NC}"
+    echo ""
     mkdir -p "$HOME/.config/termux-connecting"
     touch "$WELCOME_FILE"
 fi
 
 title "TERMUX CONNECTING — Setup"
-echo "Memeriksa dan mengkonfigurasi Termux..."
-echo "----------------------------------------"
 
-# Pastikan coreutils (timeout) tersedia
+# ─── 1. coreutils ───
 if ! command -v timeout >/dev/null; then
-    echo "  Install coreutils untuk timeout..."
-    pkg install -y coreutils
+    echo "  Dibutuhkan: coreutils (untuk timeout)"
+    if confirm "Install coreutils" "y"; then
+        pkg install -y coreutils
+    fi
 fi
 
+# ─── 2. Update & Upgrade ───
 title "1. Update & Upgrade Paket"
-echo "Menjalankan pkg update && pkg upgrade..."
-if timeout 300 pkg update -y && timeout 300 pkg upgrade -y; then
-    info "Update & upgrade berhasil"
-else
-    warn "Gagal update/upgrade. Mungkin repo tidak stabil."
-    echo ""
-    echo "  Untuk mengganti ke repo stable, jalankan:"
-    echo "  termux-change-repo"
-    echo ""
-    echo "  Pilih mirror yang stabil:"
-    echo "  - SourceForge (SF) — paling stabil"
-    echo "  - Grimler — recommended"
-    echo "  - Albatross — alternatif"
-    echo ""
-    echo -n "  Ingin ganti repo sekarang? [y/N]: "
-    read -r change_repo
-    if [[ "$change_repo" =~ ^[Yy]$ ]]; then
-        termux-change-repo
+if confirm "Jalankan pkg update && pkg upgrade" "y"; then
+    echo "  Menjalankan pkg update && pkg upgrade..."
+    if timeout 300 pkg update -y && timeout 300 pkg upgrade -y; then
+        info "Update & upgrade berhasil"
+    else
+        warn "Gagal update/upgrade. Mungkin repo tidak stabil."
+        echo ""
+        echo "  Untuk mengganti ke repo stable, jalankan:"
+        echo "  termux-change-repo"
         echo ""
-        echo "  Ulangi update setelah selesai:"
-        echo "  termux-connecting"
+        echo "  Pilih mirror yang stabil:"
+        echo "  - SourceForge (SF) — paling stabil"
+        echo "  - Grimler — recommended"
+        echo "  - Albatross — alternatif"
+        echo ""
+        if confirm "Ganti repo sekarang" "n"; then
+            termux-change-repo
+            echo ""
+            echo "  Ulangi: termux-connecting"
+        fi
     fi
+else
+    warn "Lewati update/upgrade"
 fi
 
+# ─── 3. Git & Node.js ───
 title "2. Cek Git & Node.js"
 for cmd in git node; do
-    if command -v "$cmd"; then
+    if command -v "$cmd" >/dev/null; then
         info "$cmd sudah terinstall ($($cmd --version || echo '?'))"
     else
-        warn "$cmd belum terinstall."
-        echo -n "  Install $cmd sekarang? [Y/n]: "
-        read -r install_it
-        if [[ -z "$install_it" || "$install_it" =~ ^[Yy]$ ]]; then
-            if [ "$cmd" = "node" ]; then
-                pkg install -y nodejs-lts && info "$cmd berhasil diinstall" || error "Gagal install $cmd"
-            else
-                pkg install -y "$cmd" && info "$cmd berhasil diinstall" || error "Gagal install $cmd"
-            fi
+        echo "  $cmd belum terinstall."
+        if confirm "Install $cmd" "y"; then
+            pkg="$cmd"
+            [ "$cmd" = "node" ] && pkg="nodejs-lts"
+            pkg install -y "$pkg" && info "$cmd berhasil diinstall" || error "Gagal install $cmd"
         else
             warn "Lewati install $cmd"
         fi
     fi
 done
 
+# ─── 4. Password ───
 title "3. Cek Password (passwd)"
-if [ -f "$HOME/.termux_authinfo" ] || passwd -S | grep -q "P"; then
+if [ -f "$HOME/.termux_authinfo" ] || passwd -S 2>/dev/null | grep -q "P"; then
     info "Password sudah diatur"
 else
-    warn "Belum ada password. Setting password diperlukan untuk SSH."
-    echo ""
-    echo "  Masukkan password baru:"
-    if passwd; then
-        info "Password berhasil disimpan"
+    echo "  Belum ada password. Setting password diperlukan untuk SSH."
+    if confirm "Set password sekarang" "y"; then
+        echo ""
+        echo "  Masukkan password baru:"
+        if passwd; then
+            info "Password berhasil disimpan"
+        else
+            error "Gagal menyimpan password"
+        fi
     else
-        error "Gagal menyimpan password"
+        warn "Lewati set password. SSH tidak akan bisa tanpa password."
     fi
 fi
 
+# ─── 5. Informasi Koneksi ───
 title "4. Informasi Koneksi"
 USERNAME=$(whoami)
 
-# Deteksi IP — coba beberapa metode
 IP=""
-if command -v ip; then
+if command -v ip >/dev/null; then
     IP=$(ip -4 addr show | awk '/inet /{print $2}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -1)
 fi
-if [ -z "$IP" ] && command -v ifconfig; then
+if [ -z "$IP" ] && command -v ifconfig >/dev/null; then
     IP=$(ifconfig | awk '/inet /{print $2}' | grep -v 127.0.0.1 | head -1)
 fi
-if [ -z "$IP" ] && command -v hostname; then
+if [ -z "$IP" ] && command -v hostname >/dev/null; then
     IP=$(hostname -I 2>/dev/null | awk '{print $1}')
 fi
 if [ -z "$IP" ] && [ -d /data/data/com.termux ]; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termux-connecting",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "description": "CLI setup Termux + koneksi SSH dari PC/Mac dengan Telegram alert",
   "bin": {
     "termux-connecting": "bin/termux-connecting",