[Monotone-commits-diffs] net.venge.monotone.contrib.usher: 281b668c7b2fd09d0404c1bcff1ae98cb1baa2d2

[code]

revision:            281b668c7b2fd09d0404c1bcff1ae98cb1baa2d2
date:                2011-01-21T14:31:14
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
Project/server name always comes directly after the subcommand.


manifest:
format_version "1"

new_manifest [081271cf818c2ecf5653696c5cdf28e04ca947ce]

old_revision [bfa7d8df42704958e5b9ac8014ac9edcfee3df53]

patch "utils/usherctl.in"
 from [051f6bb1f71a000a84c157fdf5228a83a5b64142]
   to [5f13caeead8513c4af65e42f5ad09876c5a39511]
============================================================
--- utils/usherctl.in	051f6bb1f71a000a84c157fdf5228a83a5b64142
+++ utils/usherctl.in	5f13caeead8513c4af65e42f5ad09876c5a39511
@@ -773,8 +773,13 @@ case $1 in
 	;;
 
     add | mod )
-	op="$1"
-	shift
+	op="$1"; shift
+	name="$1"; shift
+	if [ -z "$name" ]; then
+	    echo >&2 "No name given."
+	    exit 1
+	fi
+
 	host=
 	pattern=
 	TEMP=`POSIXLY_CORRECT=yes getopt -o h:p: -n "usherctl $op" -- "$@"`
@@ -798,11 +803,6 @@ case $1 in
 		    ;;
 	    esac
 	done
-	name="$1"; shift
-	if [ -z "$name" ]; then
-	    echo >&2 "No name given."
-	    exit 1
-	fi
 	case $1 in
 	    local | remote )
 		${op}srv "$name" "$host" "$pattern" "$@"
@@ -826,7 +826,7 @@ case $1 in
     mkpubproject | mkprivproject )
 	type=`case $1 in mkpubproject ) echo public ;; mkprivproject ) echo private ;; esac`
 	shift
-	name="$1"
+	name="$1"; shift
 	if [ -z "$name" ]; then
 	    echo >&2 "You have to give your project a name."
 	    exit 1
@@ -836,7 +836,7 @@ case $1 in
 	;;
     rmproject )
 	shift
-	name="$1"
+	name="$1"; shift
 	if [ -z "$name" ]; then
 	    echo >&2 "You have to give your project a name."
 	    exit 1
@@ -847,8 +847,11 @@ case $1 in
 
     info )
 	shift
-	name="$1"
-	shift
+	name="$1"; shift
+	if [ -z "$name" ]; then
+	    echo >&2 "No name given."
+	    exit 1
+	fi
 
 	c=
 	d=
@@ -882,11 +885,6 @@ case $1 in
 	done
 	infos=`echo $c $d $p $t`
 
-	if [ -z "$name" ]; then
-	    echo >&2 "You have to give your project a name."
-	    exit 1
-	fi
-	
 	if [ -z "$infos" ]; then
 	    projectinfo "$name" configdir database patterns type
 	else
@@ -896,8 +894,11 @@ case $1 in
 
     addkey )
 	shift
-	name="$1"
-	shift
+	name="$1"; shift
+	if [ -z "$name" ]; then
+	    echo >&2 "You have to give your project a name."
+	    exit 1
+	fi
 
 	type=ro
 	key=
@@ -918,18 +919,17 @@ case $1 in
 	    esac
 	done
 
-	if [ -z "$name" ]; then
-	    echo >&2 "You have to give your project a name."
-	    exit 1
-	fi
-	
 	addprojectkey "$name" "$type"	# The key itself is on stdin
 	;;
 
     addpattern )
 	shift
-	name="$1"
-	pattern="$2"
+	name="$1"; shift
+	pattern="$1"; shift
+	if [ -z "$name" ]; then
+	    echo >&2 "You have to give your project a name."
+	    exit 1
+	fi
 
 	addprojectpattern "$name" "$pattern"
 	;;