# HG changeset patch # User Pascal Bellard # Date 1525860492 -7200 # Node ID ccef7ffdece9f15627846c1734f8a7ac27a9a301 # Parent 03229fcb0e7b0c9cd619766220da758ffafc8144 tazbox: fix help diff -r 03229fcb0e7b -r ccef7ffdece9 tazbox/tazbox --- a/tazbox/tazbox Sat May 05 22:02:11 2018 +0200 +++ b/tazbox/tazbox Wed May 09 12:08:12 2018 +0200 @@ -56,8 +56,8 @@ all-apps $(_ 'Display icons of all installed applications') notify $(_ 'Notify user with a desktop centered box') tazapps $(_ 'Configure SliTaz default applications') -vnc $(_ 'Launch a framebuffer VNC viewer')" -ssh $(_ 'Open a remote terminal') +vnc $(_ 'Launch a framebuffer VNC viewer') +ssh $(_ 'Open a remote terminal')" newline } @@ -708,7 +708,6 @@ --field="$(_n 'Password'):H" \ --field="$(_n 'SSH Keys'):MFL" \ --field="$(_n 'SSH Proxy')" \ - --field="$(_n 'Prefer sakura terminal'):CHK" \ --field="$(_n 'Telnet protocol (instead of SSH)'):CHK" \ --always-print-result } @@ -809,11 +808,11 @@ ssh() { IFS='|'; set -- $(ssh_main) ; unset IFS - [ "$5" == "TRUE" ] && export TERM=sakura || export TERM=xterm + export TERM=sakura; [ "$(which $TERM)" ] && XTERM=$TERM || XTERM=xterm [ -n "$2" ] && export DROPBEAR_PASSWORD="$2" s=${1#*@}; k="${3:+-i ${3//!/ -i }}" - case "$4$6" in - TRUE) $TERM -e "telnet ${s/:/ }" ;; + case "$4$5" in + TRUE) $XTERM -e "telnet ${s/:/ }" ;; *RUE) dbclient $k -B $s $4 ;; *) export DBPROXY="$4"; sshx $k $1 ;; esac