From 8a5c0569a7145866ea6ef63ab2b6da2d999ba3b3 Mon Sep 17 00:00:00 2001 From: Jguer Date: Thu, 1 Dec 2016 03:01:46 +0000 Subject: [PATCH] Updated to build new format --- .SRCINFO | 6 ++---- .gitignore | 4 ++++ PKGBUILD | 34 ++++++++++++++++++++++++---------- 3 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 .gitignore diff --git a/.SRCINFO b/.SRCINFO index 64ac0b9..66926fb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,13 @@ pkgbase = yay - pkgdesc = Yet another pacman wrapper with AUR support - pkgver = 28 + pkgdesc = Yet another yogurt. Pacman wrapper with AUR support written in go. + pkgver = 1.60 pkgrel = 1 arch = i686 arch = x86_64 license = GPL makedepends = go makedepends = git - depends = pacman depends = sudo - depends = tar source = yay::git://github.com/Jguer/yay.git#branch=master md5sums = SKIP diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..113e732 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/*.tar.xz +/pkg +/src +/yay diff --git a/PKGBUILD b/PKGBUILD index fa22c7b..c20a01e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,14 +1,12 @@ # Maintainer: Jguer pkgname=yay -pkgver=28 +pkgver=1.60 pkgrel=1 -pkgdesc="Yet another pacman wrapper with AUR support" +pkgdesc="Yet another yogurt. Pacman wrapper with AUR support written in go." arch=('i686' 'x86_64') license=('GPL') depends=( - 'pacman' 'sudo' - 'tar' ) makedepends=( 'go' @@ -16,7 +14,7 @@ makedepends=( ) source=( - "yay::git://github.com/Jguer/yay.git#branch=${BRANCH:-master}" + "yay::git://github.com/jguer/yay.git#branch=${BRANCH:-master}" ) md5sums=( @@ -33,9 +31,8 @@ pkgver() { fi cd "$srcdir/$pkgname" - # local date=$(git log -1 --format="%cd" --date=short | sed s/-//g) local count=$(git rev-list --count HEAD) - echo "${count}" + echo "1.${count}" } build() { @@ -54,17 +51,34 @@ build() { mv "$srcdir/$pkgname" "$srcdir/.go/src/" - cd "$srcdir/.go/src/$pkgname/" - ln -sf "$srcdir/.go/src/$pkgname/" "$srcdir/$pkgname" + cd "$srcdir/.go/src/$pkgname/cmd/yay" + ln -sf "$srcdir/.go/src/$pkgname/cmd/yay" "$srcdir/$pkgname" git submodule update --init go get -v \ - -gcflags "-trimpath $GOPATH/src" -ldflags "-X main.version=${PKGVER}" + -gcflags "-trimpath $GOPATH/src" \ + -ldflags="-X main.version=$pkgver" } package() { + #install executable find "$srcdir/.go/bin/" -type f -executable | while read filename; do install -DT "$filename" "$pkgdir/usr/bin/$(basename $filename)" done + + cd "$srcdir/.go/src/$pkgname" + + # Install GLP v3 + mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + + # Install zsh completion + mkdir -p "${pkgdir}/usr/share/zsh/site-functions" + install -m644 zsh-completion "${pkgdir}/usr/share/zsh/site-functions/_yay" + + # Install fish completion + mkdir -p "${pkgdir}/usr/share/fish/vendor_completions.d" +install -m644 yay.fish "${pkgdir}/usr/share/fish/vendor_completions.d/yay.fish" }