Simplify cd wrapper

1 files changed, 10 insertions, 10 deletions

diff --git a/bash/bashrc.d/cd.bash b/bash/bashrc.d/cd.bash
index 267e85b9..7a075657 100644
--- a/bash/bashrc.d/cd.bash
+++ b/bash/bashrc.d/cd.bash
@@ -1,26 +1,26 @@
 # If given two arguments to cd, replace the first with the second in $PWD,
 # emulating a Zsh function that I often find useful; preserves options too
 cd() {
-    local arg dir endopts
-    local -a opts dirs
+    local arg
+    local -a opts
     for arg in "$@" ; do
         if [[ $arg == -- ]] ; then
-            endopts=1
-        elif [[ $arg == -* ]] && ! ((endopts)) ; then
+            shift
+            break
+        elif [[ $arg == -* ]] ; then
+            shift
             opts=("${opts[@]}" "$arg")
-        else
-            dirs=("${dirs[@]}" "$arg")
         fi
     done
-    if ((${#dirs[@]} == 2)) ; then
-        if [[ $PWD == *"${dirs[0]}"* ]] ; then
-            builtin cd "${opts[@]}" -- "${PWD/${dirs[0]}/${dirs[1]}}"
+    if (($# == 2)) ; then
+        if [[ $PWD == *"$1"* ]] ; then
+            builtin cd "${opts[@]}" -- "${PWD/$1/$2}"
         else
             printf 'bash: cd: could not replace substring\n' >&2
             return 1
         fi
     else
-        builtin cd "${opts[@]}" -- "${dirs[@]}"
+        builtin cd "${opts[@]}" -- "$@"
     fi
 }