slitaz-tools rev 1028
tazbox: fix help
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed May 09 12:08:12 2018 +0200 (2018-05-09) |
parents | 03229fcb0e7b |
children | 491239328786 |
files | tazbox/tazbox |
line diff
1.1 --- a/tazbox/tazbox Sat May 05 22:02:11 2018 +0200 1.2 +++ b/tazbox/tazbox Wed May 09 12:08:12 2018 +0200 1.3 @@ -56,8 +56,8 @@ 1.4 all-apps $(_ 'Display icons of all installed applications') 1.5 notify $(_ 'Notify user with a desktop centered box') 1.6 tazapps $(_ 'Configure SliTaz default applications') 1.7 -vnc $(_ 'Launch a framebuffer VNC viewer')" 1.8 -ssh $(_ 'Open a remote terminal') 1.9 +vnc $(_ 'Launch a framebuffer VNC viewer') 1.10 +ssh $(_ 'Open a remote terminal')" 1.11 newline 1.12 } 1.13 1.14 @@ -708,7 +708,6 @@ 1.15 --field="$(_n 'Password'):H" \ 1.16 --field="$(_n 'SSH Keys'):MFL" \ 1.17 --field="$(_n 'SSH Proxy')" \ 1.18 - --field="$(_n 'Prefer sakura terminal'):CHK" \ 1.19 --field="$(_n 'Telnet protocol (instead of SSH)'):CHK" \ 1.20 --always-print-result 1.21 } 1.22 @@ -809,11 +808,11 @@ 1.23 1.24 ssh() { 1.25 IFS='|'; set -- $(ssh_main) ; unset IFS 1.26 - [ "$5" == "TRUE" ] && export TERM=sakura || export TERM=xterm 1.27 + export TERM=sakura; [ "$(which $TERM)" ] && XTERM=$TERM || XTERM=xterm 1.28 [ -n "$2" ] && export DROPBEAR_PASSWORD="$2" 1.29 s=${1#*@}; k="${3:+-i ${3//!/ -i }}" 1.30 - case "$4$6" in 1.31 - TRUE) $TERM -e "telnet ${s/:/ }" ;; 1.32 + case "$4$5" in 1.33 + TRUE) $XTERM -e "telnet ${s/:/ }" ;; 1.34 *RUE) dbclient $k -B $s $4 ;; 1.35 *) export DBPROXY="$4"; sshx $k $1 ;; 1.36 esac