Merge branch 'issue-73'

Author: aurora

rmate

@@ -168,10 +168,10 @@ function canonicalize {
     echo "$result"
 }
 
-while [[ "${1:0:1}" = "-" || "$1" =~ ^\+([0-9]+)$ ]]; do
+while [[ "$1" != "" ]]; do
     case $1 in
         -)
-            break
+            filepaths+=("-")
             ;;
         --)
             shift
@@ -220,12 +220,16 @@ while [[ "${1:0:1}" = "-" || "$1" =~ ^\+([0-9]+)$ ]]; do
             showusage
             exit 0
             ;;
-        +[0-9]*)
+        +[0-9][0-9]*)
             selections+=(${1:1})
             ;;
         *)
-            showusage
-            exit 1
+            if [[ "${1:0:1}" = "-" ]]; then
+                showusage
+                exit 1
+            else
+                filepaths+=("$1")
+            fi
             ;;
     esac
 
@@ -236,7 +240,7 @@ if [[ "$host" = "auto" && "$SSH_CONNECTION" != "" ]]; then
     host=${SSH_CONNECTION%% *}
 fi
 
-filepaths=("$@")
+filepaths=("${filepaths[@]}" "$@")
 
 if [ "${filepaths[*]}" = "" ]; then
     if [[ $nowait = false ]]; then