1 files changed, 7 insertions, 4 deletions
diff --git a/shell b/shell
index 0dd64e6..df569e9 100755
--- a/shell
+++ b/shell
@@ -59,6 +59,9 @@ fi
 # Set default screen title
 window_title $DEST
 
+# Shift args
+shift 2
+
 # Dispatcher
 if [ "$BASENAME" == "shells" ]; then
   # Remote screen shell using $AUTOSSH
@@ -66,7 +69,7 @@ if [ "$BASENAME" == "shells" ]; then
     SUDO="sudo"
     $AUTOSSH $DEST -t -- "`shell_remote_multiplexer`"
   else
-    $AUTOSSH $DEST -t -- "`shell_remote_multiplexer` $COMMAND"
+    $AUTOSSH $DEST -t -- "`shell_remote_multiplexer` $COMMAND $*"
   fi
 else
   if [ -z "$COMMAND" ] && shell_${LOCAL_MULTIPLEXER}_ls $DEST; then
@@ -80,14 +83,14 @@ else
   elif [ -z "$COMMAND" ] && ( [ -f "$HOME/.screen/$DEST" ] || [ -f "$HOME/.tmux/$DEST" ] ); then
     # Local root shell
     window_title $DEST
-    shell local $DEST
+    shell local $DEST $*
   elif [ "$DEST" == "local" ]; then
     # Local screen shell
     window_title $COMMAND
-    $LOCAL_MULTIPLEXER $COMMAND
+    $LOCAL_MULTIPLEXER $COMMAND $*
   else
     # Remote shell using $AUTOSSH
-    $AUTOSSH $DEST -t -- $COMMAND
+    $AUTOSSH $DEST -t -- $COMMAND $*
   fi
 fi