scripts/launch_alacritty.sh

@@ -1,32 +1,21 @@
 #!/bin/bash
 
 RUNNING_SSH=false
-RUNNING_WAYPIPE=false
-SSH_CLIENT=""
-CHILD_PID=$(pgrep -P "$1")
+CHILD_PID=$(pgrep -P $1)
 
-GRAND_CHILD_PID=$(pgrep -P "$CHILD_PID")
-if [ "$GRAND_CHILD_PID" != 0 ]; then
-    GRAND_CHILD_NAME=$(ps -p "$GRAND_CHILD_PID" -o comm=)
-    if [ "$GRAND_CHILD_NAME" == "ssh" ]; then
-        RUNNING_SSH=true
-        CHILD_PID=$GRAND_CHILD_PID
-        SSH_CLIENT=$(ps -p "$CHILD_PID" -o args --no-headers | awk '{ print $2 }')
-    fi
-    if [ "$GRAND_CHILD_NAME" == "waypipe" ]; then
-        RUNNING_WAYPIPE=true
-        CHILD_PID=$(pgrep -P "$GRAND_CHILD_PID")
-        SSH_CLIENT=$(ps -p "$GRAND_CHILD_PID" -o args --no-headers | awk '{ print $3 }')
-    fi
-fi
+[[ $(ps -p $CHILD_PID -o comm=) == "ssh" ]] && RUNNING_SSH=true
+
+GRAND_CHILD_PID=$(pgrep -P $CHILD_PID)
+[[ $? == 0 ]] && [[ $(ps -p $GRAND_CHILD_PID -o comm=) == "ssh" ]] && RUNNING_SSH=true && CHILD_PID=$GRAND_CHILD_PID
 
 
-if [ $RUNNING_SSH == true ] || [ $RUNNING_WAYPIPE == true ]; then
+if [ $RUNNING_SSH == true ]; then
+    CLIENT=$(ps -p $CHILD_PID -o args --no-headers | awk '{ print $2 }')
     PORT=$(ss -tnpa | grep ssh | grep "pid=$CHILD_PID" | awk '{ print $4 }' | grep -o '[0-9]*$')
-    alacritty -e ssh "$SSH_CLIENT" -t "cd \"\$(readlink -e /proc/\$(cat /tmp/ssh_session_$PORT)/cwd)\"; zsh --login"
+    alacritty -e ssh $CLIENT -t "cd \"\$(readlink -e /proc/\$(cat /tmp/ssh_session_$PORT)/cwd)\"; zsh --login"
 else
-    if [ "$(ps -p "$1" -o comm=)" == "alacritty" ]; then
-        CWD=$(readlink -e /proc/"$CHILD_PID"/cwd)
+    if [ "$(ps -p $1 -o comm=)" == "alacritty" ]; then
+        CWD=$(readlink -e /proc/$CHILD_PID/cwd)
         if [ "$CWD" != "" ]; then
             alacritty --working-directory "$CWD"
         else

zsh/.zshrc

@@ -153,10 +153,6 @@ function zvm_after_init() {
     bindkey -M emacs "^Y" find_local_files
     bindkey -M vicmd "^Y" find_local_files
     bindkey -M viins "^Y" find_local_files
-
-    if [ "$REMOTE_PATH" != "" ]; then
-        cd $REMOTE_PATH
-    fi
 }
 
 zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
@@ -225,12 +221,12 @@ function o () {
 	xdg-open "$1" &!
 }
 
-function server() {
-    waypipe ssh -t mallorea env REMOTE_PATH="$(pwd)" "zsh --login"
+function s() {
+    ssh server@mallorea -t "cd \"$(pwd)\" ; zsh --login"
 }
 
 function riva() {
-    waypipe ssh -t riva env REMOTE_PATH="$(pwd)" "zsh --login"
+    ssh user@riva -t "cd \"$(pwd)\" ; zsh --login"
 }
 
 if [ "$SSH_CLIENT" ]