From e1ee1fc29a32f6983e89cdead0c12510214931a5 Mon Sep 17 00:00:00 2001
From: Cory Bennett <github@corybennett.org>
Date: Fri, 13 Feb 2015 16:48:10 -0800
Subject: [PATCH] tweak usage ordering fix looking for generic "create"
 template

---
 jira/cli/cli.go |  6 +++++-
 jira/main.go    | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/jira/cli/cli.go b/jira/cli/cli.go
index 62f1776..1c1f31b 100644
--- a/jira/cli/cli.go
+++ b/jira/cli/cli.go
@@ -187,7 +187,11 @@ func (c *Cli) getTemplate(name string) string {
 		// create-bug etc are special, if we dont find it in the path
 		// then just return a generic create template
 		if strings.HasPrefix(name, "create-") {
-			return all_templates["create"]
+			if file, err := FindClosestParentPath(".jira.d/templates/create"); err != nil {
+				return all_templates["create"]
+			} else {
+				return readFile(file)
+			}
 		}
 		return all_templates[name]
 	} else {
diff --git a/jira/main.go b/jira/main.go
index 009d8be..fbd16cb 100644
--- a/jira/main.go
+++ b/jira/main.go
@@ -19,19 +19,9 @@ func main() {
 	home := os.Getenv("HOME")
 	usage := fmt.Sprintf(`
 Usage:
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] fields
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] login
   jira [-v ...] [-u USER] [-e URI] [-t FILE] (ls|list) ( [-q JQL] | [-p PROJECT] [-c COMPONENT] [-a ASSIGNEE] [-i ISSUETYPE]) 
   jira [-v ...] [-u USER] [-e URI] [-t FILE] view ISSUE
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] issuelinktypes
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] transmeta ISSUE
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] editmeta ISSUE
-  jira [-v ...] export-templates [-d DIR]
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] ISSUE
   jira [-v ...] [-u USER] [-e URI] [-t FILE] edit ISSUE [-m COMMENT] [-o KEY=VAL]...
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] issuetypes [-p PROJECT] 
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] createmeta [-p PROJECT] [-i ISSUETYPE] 
-  jira [-v ...] [-u USER] [-e URI] [-t FILE] transitions ISSUE
   jira [-v ...] [-u USER] [-e URI] [-t FILE] create [-p PROJECT] [-i ISSUETYPE] [-o KEY=VAL]...
   jira [-v ...] [-u USER] [-e URI] DUPLICATE dups ISSUE
   jira [-v ...] [-u USER] [-e URI] BLOCKER blocks ISSUE
@@ -46,7 +36,17 @@ Usage:
   jira [-v ...] [-u USER] [-e URI] [-t FILE] comment ISSUE [-m COMMENT]
   jira [-v ...] [-u USER] [-e URI] take ISSUE
   jira [-v ...] [-u USER] [-e URI] (assign|give) ISSUE ASSIGNEE
-
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] fields
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] issuelinktypes
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] transmeta ISSUE
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] editmeta ISSUE
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] issuetypes [-p PROJECT] 
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] createmeta [-p PROJECT] [-i ISSUETYPE] 
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] transitions ISSUE
+  jira [-v ...] export-templates [-d DIR]
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] login
+  jira [-v ...] [-u USER] [-e URI] [-t FILE] ISSUE
+ 
 General Options:
   -e --endpoint=URI   URI to use for jira
   -h --help           Show this usage