Merge release branch

albertrdixon · Sep 29, 2015 · 966169a · 966169a
2 parents 6f30a30 + 226011d
commit 966169a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -56,7 +56,8 @@ package: build
 	@for p in $(PLATFORMS) ; do \
 		echo "==> Tar'ing up $$p/amd64 binary" ; \
 		test -f bin/$(EXECUTABLE)-$$p && \
-		tar czf $(EXECUTABLE)-$$p.tgz bin/$(EXECUTABLE)-$$p ; \
+		mv bin/$(EXECUTABLE)-$$p t2 && \
+		tar czf $(EXECUTABLE)-$$p.tgz t2 ; \
 	done
 
 clean:

diff --git a/doc.go b/doc.go
@@ -2,4 +2,4 @@
 package tmplnator
 
 // Version is the version
-const Version = "v2.2.0"
+const Version = "v2.2.1"
diff --git a/helpers.go b/helpers.go
@@ -32,6 +32,7 @@ func newFuncMap(f *FileInfo) map[string]interface{} {
 		"-e":          exists,
 		"has_key":     hasKey,
 		"def":         def,
+		"default":     def,
 		"url":         parseURL,
 		"sha":         hash,
 		"downcase":    downcase,