termux-connecting 1.1.27 → 1.1.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/termux-connecting +7 -39
- package/package.json +1 -1
package/bin/termux-connecting
CHANGED
|
@@ -144,32 +144,18 @@ USERNAME=$(whoami)
|
|
|
144
144
|
|
|
145
145
|
IP=""
|
|
146
146
|
if command -v ip >/dev/null; then
|
|
147
|
-
IP=$(ip -4 addr show 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -1)
|
|
147
|
+
IP=$(timeout 3 ip -4 addr show 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -1)
|
|
148
148
|
fi
|
|
149
149
|
if [ -z "$IP" ] && command -v ifconfig >/dev/null; then
|
|
150
|
-
IP=$(ifconfig 2>/dev/null | awk '/inet /{print $2}' | grep -v 127.0.0.1 | head -1)
|
|
151
|
-
fi
|
|
152
|
-
if [ -z "$IP" ] && command -v hostname >/dev/null; then
|
|
153
|
-
IP=$(hostname -I 2>/dev/null | awk '{print $1}')
|
|
150
|
+
IP=$(timeout 3 ifconfig 2>/dev/null | awk '/inet /{print $2}' | grep -v 127.0.0.1 | head -1)
|
|
154
151
|
fi
|
|
155
152
|
if [ -z "$IP" ] && [ -d /data/data/com.termux ]; then
|
|
156
|
-
IP=$(ip route get 1.1.1.1 2>/dev/null | awk '{print $7}' | head -1)
|
|
153
|
+
IP=$(timeout 3 ip route get 1.1.1.1 2>/dev/null | awk '{print $7}' | head -1)
|
|
157
154
|
fi
|
|
158
155
|
if [ -z "$IP" ]; then
|
|
159
156
|
IP=""
|
|
160
157
|
fi
|
|
161
158
|
|
|
162
|
-
WIFI_SSID=""
|
|
163
|
-
if command -v termux-wifi-connectioninfo >/dev/null; then
|
|
164
|
-
WIFI_SSID=$(termux-wifi-connectioninfo 2>/dev/null | grep -o '"ssid":"[^"]*"' | cut -d'"' -f4)
|
|
165
|
-
fi
|
|
166
|
-
if [ -z "$WIFI_SSID" ] && command -v iw >/dev/null; then
|
|
167
|
-
WIFI_SSID=$(iw dev wlan0 link 2>/dev/null | grep -i ssid | sed 's/.*SSID: //')
|
|
168
|
-
fi
|
|
169
|
-
if [ -z "$WIFI_SSID" ] && [ -r /proc/net/wireless ]; then
|
|
170
|
-
WIFI_SSID=$(awk 'NR==3{print $1}' /proc/net/wireless 2>/dev/null | tr -d ':')
|
|
171
|
-
fi
|
|
172
|
-
|
|
173
159
|
is_cgnat() {
|
|
174
160
|
[[ "$1" =~ ^10\. ]] || [[ "$1" =~ ^100\.(6[4-9]|[7-9][0-9]|1[0-1][0-9]|12[0-7])\. ]]
|
|
175
161
|
}
|
|
@@ -181,9 +167,6 @@ is_wifi() {
|
|
|
181
167
|
echo " Username : $USERNAME"
|
|
182
168
|
echo " IP : ${IP:-tidak terdeteksi}"
|
|
183
169
|
echo " Port : 8022"
|
|
184
|
-
if [ -n "$WIFI_SSID" ]; then
|
|
185
|
-
echo " WiFi : $WIFI_SSID"
|
|
186
|
-
fi
|
|
187
170
|
echo ""
|
|
188
171
|
|
|
189
172
|
CONNECTION_OK=false
|
|
@@ -195,7 +178,7 @@ if [ -z "$IP" ]; then
|
|
|
195
178
|
echo " 1. Buka Pengaturan → WiFi, hubungkan ke jaringan rumah/kantor"
|
|
196
179
|
echo " 2. Setelah terhubung, jalankan ulang: termux-connecting -y"
|
|
197
180
|
elif is_cgnat "$IP"; then
|
|
198
|
-
warn "IP ${IP} terdeteksi sebagai jaringan SELULER/VPN
|
|
181
|
+
warn "IP ${IP} terdeteksi sebagai jaringan SELULER/VPN"
|
|
199
182
|
echo " PC dan HP harus dalam jaringan WiFi yang SAMA."
|
|
200
183
|
echo ""
|
|
201
184
|
echo " Langkah:"
|
|
@@ -213,18 +196,13 @@ elif is_wifi "$IP"; then
|
|
|
213
196
|
echo " Lalu isi data di atas saat diminta."
|
|
214
197
|
echo " Setelah setup, cukup: ssh ${HOST_ALIAS:-termux-a8star}"
|
|
215
198
|
echo ""
|
|
216
|
-
|
|
217
|
-
echo " PC harus terhubung ke WiFi: ${WIFI_SSID}"
|
|
218
|
-
else
|
|
219
|
-
warn "Pastikan HP dan PC terhubung ke jaringan WiFi YANG SAMA"
|
|
220
|
-
fi
|
|
199
|
+
warn "Pastikan HP dan PC terhubung ke jaringan WiFi YANG SAMA"
|
|
221
200
|
echo ""
|
|
222
201
|
echo " Data koneksi — simpan untuk setup PC:"
|
|
223
202
|
echo " ┌──────────────────────────────────┐"
|
|
224
203
|
printf " │ %-32s │\n" "Username : $USERNAME"
|
|
225
204
|
printf " │ %-32s │\n" "IP : $IP"
|
|
226
205
|
printf " │ %-32s │\n" "Port : 8022"
|
|
227
|
-
[ -n "$WIFI_SSID" ] && printf " │ %-32s │\n" "WiFi : $WIFI_SSID"
|
|
228
206
|
echo " └──────────────────────────────────┘"
|
|
229
207
|
else
|
|
230
208
|
warn "IP ${IP} tidak dikenal — mungkin bukan jaringan lokal"
|
|
@@ -241,19 +219,16 @@ info "Setup selesai!"
|
|
|
241
219
|
echo ""
|
|
242
220
|
|
|
243
221
|
# ─── Opsional: Cek Permission (hanya jika koneksi OK) ───
|
|
244
|
-
if [ "$CONNECTION_OK" = "true" ] && [ "$AUTO" = "false" ] && confirm "Cek permission
|
|
222
|
+
if [ "$CONNECTION_OK" = "true" ] && [ "$AUTO" = "false" ] && confirm "Cek permission tambahan (storage, auto-start sshd)" "n"; then
|
|
245
223
|
echo ""
|
|
246
224
|
title "Status Permission & Fitur"
|
|
247
225
|
|
|
248
|
-
|
|
226
|
+
HAS_STORAGE="no"; HAS_BOOT="no"
|
|
249
227
|
|
|
250
|
-
command -v termux-wifi-connectioninfo >/dev/null 2>&1 && HAS_API="yes"
|
|
251
228
|
[ -d "$HOME/storage" ] && HAS_STORAGE="yes"
|
|
252
229
|
[ -f "$HOME/.termux/boot/boot-sshd" ] && HAS_BOOT="yes"
|
|
253
230
|
|
|
254
231
|
echo " ┌─────────────────────────────────────────────┐"
|
|
255
|
-
[ "$HAS_API" = "yes" ] && echo " │ ✅ Termux:API — WiFi SSID │" \
|
|
256
|
-
|| echo " │ ❌ Termux:API — WiFi SSID │"
|
|
257
232
|
[ "$HAS_STORAGE" = "yes" ] && echo " │ ✅ Storage — akses penyimpanan │" \
|
|
258
233
|
|| echo " │ ❌ Storage — akses penyimpanan │"
|
|
259
234
|
[ "$HAS_BOOT" = "yes" ] && echo " │ ✅ Termux:Boot — auto-start sshd │" \
|
|
@@ -261,13 +236,6 @@ if [ "$CONNECTION_OK" = "true" ] && [ "$AUTO" = "false" ] && confirm "Cek permis
|
|
|
261
236
|
echo " └─────────────────────────────────────────────┘"
|
|
262
237
|
echo ""
|
|
263
238
|
|
|
264
|
-
if [ "$HAS_API" = "no" ] && confirm " Install Termux:API (WiFi SSID)" "y"; then
|
|
265
|
-
pkg install -y termux-api
|
|
266
|
-
echo " Install aplikasi Termux:API dari F-Droid:"
|
|
267
|
-
echo " https://f-droid.org/packages/com.termux.api/"
|
|
268
|
-
echo ""
|
|
269
|
-
fi
|
|
270
|
-
|
|
271
239
|
if [ "$HAS_STORAGE" = "no" ] && confirm " Setup storage permission" "y"; then
|
|
272
240
|
termux-setup-storage
|
|
273
241
|
echo " Izininkan pop-up permission di Android"
|