diff options
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PKGBUILD | 36 |
3 files changed, 19 insertions, 26 deletions
@@ -1,7 +1,7 @@ pkgbase = pkgupd-git pkgdesc = Checks repositories and AUR for package updates - pkgver = 0.41 - pkgrel = 1 + pkgver = 0.43 + pkgrel = 2 url = https://github.com/foucault/pkgupd arch = i686 arch = x86_64 @@ -14,8 +14,7 @@ pkgbase = pkgupd-git conflicts = pkgupd options = !strip backup = etc/conf.d/pkgupd - source = pkgupd::git://github.com/foucault/pkgupd + source = pkgupd::git+https://github.com/foucault/pkgupd md5sums = SKIP pkgname = pkgupd-git - diff --git a/.gitignore b/.gitignore index 43ca0f761633..c88ddbd3d3e9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,7 @@ src/* *.tar.gz *.tar.xz *.tar.bz2 +*.tar.zst +*.tar.zstd *.zip *.swp @@ -1,8 +1,8 @@ # Contributor: Spyros Stathopoulos <foucault.online@gmail.com> pkgname=pkgupd-git _pkgname=pkgupd -pkgver=0.41 -pkgrel=1 +pkgver=0.43 +pkgrel=2 pkgdesc="Checks repositories and AUR for package updates" arch=('i686' 'x86_64') url="https://github.com/foucault/pkgupd" @@ -12,44 +12,36 @@ conflicts=('pkgupd') makedepends=('go>=1.3' 'git' 'perl') optdepends=('python: for the default cli client') options=('!strip') -source=("${_pkgname}::git://github.com/foucault/${_pkgname}") +source=("${_pkgname}::git+https://github.com/foucault/${_pkgname}") backup=('etc/conf.d/pkgupd') _gogets=("github.com/jessevdk/go-flags" "github.com/fsnotify/fsnotify") md5sums=('SKIP') pkgver() { - cd ${srcdir}/${_pkgname} + cd ${_pkgname} echo "0.$(git rev-list --count master)" } prepare() { - mkdir -p ${srcdir}/godeps - msg "Getting GO dependencies" - for dep in ${_gogets[@]}; do - msg2 "Go getting ${dep}" - GOPATH=${srcdir}/godeps go get -v ${dep} - done - if [[ -e ${srcdir}/godeps/src/${_pkgname} ]]; then - if [[ -h ${srcdir}/godeps/src/${_pkgname} ]]; then - unlink ${srcdir}/godeps/src/${_pkgname} - else - error "${srcdir}/godeps/src/${_pkgname} should be a link" - fi - fi - ln -s ${srcdir}/${_pkgname} ${srcdir}/godeps/src + mkdir -p ${srcdir}/godeps/src + cd ${srcdir}/${_pkgname} + GOPATH=${srcdir}/godeps go mod init ${_pkgname} + GOPATH=${srcdir}/godeps go mod tidy } build() { + msg2 "${srcdir}" msg "Building glue library" + msg2 $(pwd) cd ${srcdir}/${_pkgname}/alpm make - msg "Building pkgupd" - cd ${srcdir} + msg "Building pkgupd in ${srcdir}/${_pkgname}" + cd ${srcdir}/${_pkgname} GOPATH=${srcdir}/godeps \ LIBRARY_PATH=${srcdir}/${_pkgname}/alpm \ - go install -v pkgupd/pkgupd + go build -o ${_pkgname} -v pkgupd/pkgupd msg "Building man page" cd ${srcdir}/${_pkgname} @@ -62,7 +54,7 @@ build() { package() { cd ${srcdir}/${_pkgname} - install -D -m755 ${srcdir}/godeps/bin/pkgupd \ + install -D -m755 ${srcdir}/${_pkgname}/${_pkgname}/${_pkgname} \ ${pkgdir}/usr/bin/pkgupd install -D -m755 ${srcdir}/${_pkgname}/alpm/libgoalpm.so \ ${pkgdir}/usr/lib/libgoalpm.so |