Merge pull request Jguer#272 from Jguer/directory-change

Update version for close release
frebib · Mar 22, 2018 · 415659d · 415659d
2 parents ac02498 + 82124c1
commit 415659d
Show file tree

Hide file tree

Showing 5 changed files with 332 additions and 306 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 .PHONY: all default install test build release clean
-VERSION := $(shell git rev-list --count master)
-LDFLAGS=-ldflags '-s -w -X main.version=4.${VERSION}'
+VERSION := 5.$(shell git rev-list --count master)
+LDFLAGS=-ldflags '-s -w -X main.version=${VERSION}'
 GOFILES := $(shell ls *.go | grep -v /vendor/)
 ARCH=$(shell uname -m)
 PKGNAME=yay
 
-PACKAGE=${PKGNAME}_4.${VERSION}_${ARCH}
+PACKAGE=${PKGNAME}_${VERSION}_${ARCH}
 
 default: build
 
@@ -20,10 +20,10 @@ build:
 release:
 	mkdir ${PACKAGE}
 	cp ./yay ${PACKAGE}/
-	cp ./yay.8 ${PACKAGE}/
-	cp ./zsh-completion ${PACKAGE}/
-	cp ./yay.fish ${PACKAGE}/
-	cp ./bash-completion ${PACKAGE}/
+	cp ./doc/yay.8 ${PACKAGE}/
+	cp ./completions/zsh ${PACKAGE}/
+	cp ./completions/fish ${PACKAGE}/
+	cp ./completions/bash ${PACKAGE}/
 package:
 	tar -czvf ${PACKAGE}.tar.gz ${PACKAGE}
 clean:

diff --git a/bash-completion → completions/bash b/bash-completion → completions/bash
@@ -1,3 +1,4 @@
+# vim:fdm=marker foldlevel=0 tabstop=2 shiftwidth=2 filetype=bash
 # This file is in the public domain.
 
 _arch_compgen() {

diff --git a/yay.fish → completions/fish b/yay.fish → completions/fish
@@ -1,3 +1,4 @@
+# vim:fdm=marker foldlevel=0 tabstop=2 shiftwidth=2 filetype=fish
 # Original Author for pacman: Giorgio Lando <patroclo7@gmail.com>
 # Updated for yay by jguer