Fix argument processing

dotfiles/gittum/bin/sibling

@@ -23,13 +23,6 @@
 #     $ git remote add origin ssh://our_server/projects/FAKE
 
 
-## cfgz
-#
-
-origin_name="origin"
-sibling_conf=".gittum-sibling"
-
-
 ## funz
 #
 
@@ -39,7 +32,7 @@ die() {
 }
 
 usage() {
-    echo "usage: git $(basename $0) NEWPROJ [TEMPLATE]"
+    echo "usage: git $(basename $0) [-v] [-s SIBLING] [-r REMOTE] PROJECT"
     exit 0
 }
 
@@ -57,21 +50,36 @@ rewrite_uri_to () {
 ## initz
 #
 
-project=$1
-test -n "$project" || usage
-
-if [ -f $sibling_conf ];
-then
-    sibling=$(cat $sibling_conf);
-else
-    sibling=$(find -maxdepth 1 -type d -name "[^.]*" | sort | head -1)
-fi
+origin_name="origin"
+sibling_conf=".gittum-sibling"
+verbose=false
+sibling=$(find -maxdepth 1 -type d -name "[^.]*" | sort | head -1)
+test -f $sibling_conf && sibling=$(cat $sibling_conf)
+remote_name="origin"
+
+while true;
+do
+    case $1 in
+        -r|--remote-name)
+            remote_name=$2
+            shift 2
+            ;;
+        -s|--sibling)
+            sibling=$2
+            shift 2
+            ;;
+        "")
+            break
+            ;;
+        *)
+            project=$1
+            shift
+            ;;
+    esac
+done
 
-if [ -z "$sibling" ];
-then
-    echo "could not find older sibling" 1>&2
-    exit 1
-fi
+test -n "$project" || usage
+test -n "$sibling" || die "could not find older sibling"
 
 
 ## body