wrynegade/dotwryn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated ssh; fixed bugs, allowed empty 'cmux' to connect to default local conenction

Browse Source
This commit is contained in:
Wryn Wagner 2021-04-09 15:14:18 -06:00
parent 72c1f08b55
commit 3b8514d9aa
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zsh/ssh
View File

@ -29,9 +29,11 @@ function WRYN_REMOTE_CONNECTOR() {
local SSH_ID="^$CONNECTION$WRYN_SSH_DELIMITER" local SSH_ID="^$CONNECTION$WRYN_SSH_DELIMITER"
[ $2 ] \ [[ $COMMAND != 'tmux' ]] && [ ! $CONNECTION ] \
|| { echo 'Must specify a connection'; return 1 }; && { echo 'Must specify a connection'; return 1 };
grep -q "$SSH_ID" "$WRYN_SSH_CONNECTION_LIST" >/dev/null 2>&1 \ grep -q "$SSH_ID" "$WRYN_SSH_CONNECTION_LIST" >/dev/null 2>&1 \
|| [ ! $CONNECTION ] \
|| { echo 'No such connection'; return 2 }; || { echo 'No such connection'; return 2 };
case $COMMAND in; case $COMMAND in;
@ -67,6 +69,7 @@ _WRYN_REMOTE_CONNECTOR() {
sshfs ) _sshfs;; sshfs ) _sshfs;;
cpto | cpfrom ) _scp;; cpto | cpfrom ) _scp;;
tmux ) _tmux;; tmux ) _tmux;;
ssh-copy-id ) compadd $(ls);;
* ) ;; * ) ;;
esac esac
;; ;;
@ -90,11 +93,15 @@ WRYN_REMOTE_TMUX() {
local SSH_ID="$1" local SSH_ID="$1"
local UTF8_FLAG=$(locale charmap | grep -q 'UTF-8' && echo '-u') local UTF8_FLAG=$(locale charmap | grep -q 'UTF-8' && echo '-u')
[ ! $2 ] \ [[ "$SSH_ID" == "^$WRYN_SSH_DELIMITER" ]] \
&& ssh $(WRYN_SSH_PARSE_ARGS $SSH_ID) -t tmux $UTF8_FLAG new-session -As $TMUX_DEFAULT_SESSION_NAME \ && { tmux new-session -As $TMUX_DEFAULT_SESSION_NAME } \
|| { || {
[ $3 ] \ [ ! $2 ] \
&& ssh $(WRYN_SSH_PARSE_ARGS $SSH_ID) -t tmux $UTF8_FLAG ${@:2} \ && ssh $(WRYN_SSH_PARSE_ARGS $SSH_ID) -t tmux $UTF8_FLAG new-session -As $TMUX_DEFAULT_SESSION_NAME \
|| ssh $(WRYN_SSH_PARSE_ARGS $SSH_ID) -t tmux $UTF8_FLAG a -t $2; || {
} [ $3 ] \
&& { ssh $(WRYN_SSH_PARSE_ARGS $SSH_ID) -t tmux $UTF8_FLAG ${@:2}; return 0 } \
|| { ssh $(WRYN_SSH_PARSE_ARGS $SSH_ID) -t tmux $UTF8_FLAG new-session -As $2; };
}
}
} }