scripts/launch_alacritty.sh

@@ -21,10 +21,9 @@ if [ "$GRAND_CHILD_PID" != 0 ]; then
 fi
 
 
-if [ $RUNNING_WAYPIPE == true ]; then
-    PREVIOUS_SESSION_ID=$(grep -z "SSH_SESSION_ID" "/proc/$CHILD_PID/environ" | xargs -0 -n 1 | grep -oP "[0-9]*")
-    SSH_SESSION_ID=$RANDOM
-    alacritty -e zsh -c "SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t \"$SSH_CLIENT\" env SSH_SESSION_ID=\"$SSH_SESSION_ID\" PREVIOUS_SESSION_ID=\"$PREVIOUS_SESSION_ID\" \"zsh --login\""
+if [ $RUNNING_SSH == true ] || [ $RUNNING_WAYPIPE == true ]; then
+    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"
 else
     if [ "$(ps -p "$1" -o comm=)" == "alacritty" ]; then
         CWD=$(readlink -e /proc/"$CHILD_PID"/cwd)

zsh/.zshrc

@@ -154,15 +154,8 @@ function zvm_after_init() {
     bindkey -M vicmd "^Y" find_local_files
     bindkey -M viins "^Y" find_local_files
 
-
-    if [ "$SSH_SESSION_ID" != "" ]; then
-        mkdir -p /tmp/ssh_sessions
-        echo $$ > /tmp/ssh_sessions/"$SSH_SESSION_ID"
-    fi
     if [ "$REMOTE_PATH" != "" ]; then
-        cd "$REMOTE_PATH"
-    elif [ "$PREVIOUS_SESSION_ID" != "" ]; then
-        cd $(readlink -e /proc/$(cat /tmp/ssh_sessions/$PREVIOUS_SESSION_ID)/cwd)
+        cd $REMOTE_PATH
     fi
 }
 
@@ -232,15 +225,23 @@ function o () {
 	xdg-open "$1" &!
 }
 
-function run_waypipe() {
-    SSH_SESSION_ID=$RANDOM
-    SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t $1 env REMOTE_PATH="$(pwd)" SSH_SESSION_ID=$SSH_SESSION_ID "zsh --login"
+function server() {
+    waypipe ssh -t mallorea env REMOTE_PATH="$(pwd)" "zsh --login"
 }
 
-alias mallorea="run_waypipe mallorea"
-alias vault="run_waypipe vault"
-alias riva="run_waypipe riva"
-alias kell="run_waypipe kell"
+function riva() {
+    waypipe ssh -t riva env REMOTE_PATH="$(pwd)" "zsh --login"
+}
+
+function kell() {
+    waypipe ssh -t kell env REMOTE_PATH="$(pwd)" "zsh --login"
+}
+
+if [ "$SSH_CLIENT" ]
+then
+    source_port=$(echo $SSH_CLIENT | awk '{ print $2 }')
+    echo $$ > /tmp/ssh_session_$source_port
+fi
 
 if [[ "$TERM" == (Eterm*|alacritty*|aterm*|gnome*|konsole*|kterm*|putty*|rxvt*|screen*|tmux*|xterm*) ]]; then
 	add-zsh-hook -Uz precmd xterm_title_precmd