Skip to content
This repository was archived by the owner on Oct 31, 2023. It is now read-only.

Post-v25 fixes #54

Merged
Daenyth merged 4 commits into from
Feb 12, 2014
Merged

Post-v25 fixes #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0f4007
Update pkgver in the PKGBUILD for v25
jrstjohn Feb 12, 2014
bb58b3b
Replace backticks with more preferred command substitution syntax in the
jrstjohn Feb 12, 2014
3c61d1b
PKGBUILD-git: Fix possible vercmp issue with pkgver() function
jrstjohn Feb 12, 2014
4e55012
PKGBUILDs: Add 'gem2arch' as a dependency
jrstjohn Feb 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
pkgname=pkgtools
pkgver=24
pkgver=25
pkgrel=1
pkgdesc="A collection of scripts for Arch Linux packages"
arch=('any')
url="https://bbs.archlinux.org/viewtopic.php?pid=384196"
license=('GPL')
depends=('bash>=4' 'pcre' 'libarchive' 'python' 'namcap' 'pkgfile')
depends=('bash>=4' 'pcre' 'libarchive' 'python' 'namcap' 'pkgfile' 'gem2arch')
optdepends=('abs: Provides PKGBUILD prototypes for newpkg')
provides=('newpkg')
backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
install=pkgtools.install
source=("${pkgname}-v${pkgver}.tar.gz::https://github.com/Daenyth/pkgtools/tarball/v$pkgver")
md5sums=('f139c3940e1038cac4e29e985089e8a8')
md5sums=('9e9d7aad5ba8ecee1b798c3ed4e0a0a7')

package() {
cd "Daenyth-$pkgname"-*
Expand Down
4 changes: 2 additions & 2 deletions PKGBUILD-git
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pkgdesc="A collection of scripts for Arch Linux packages"
arch=('any')
url="https://github.com/Daenyth/pkgtools"
license=('GPL')
depends=('bash>=4' 'libarchive' 'pcre' 'python' 'namcap' 'pkgfile')
depends=('bash>=4' 'libarchive' 'pcre' 'python' 'namcap' 'pkgfile' 'gem2arch')
makedepends=('git')
optdepends=('abs: Provides PKGBUILD prototypes for newpkg')
provides=('pkgtools' 'newpkg')
Expand All @@ -20,7 +20,7 @@ sha1sums=('SKIP')

pkgver() {
cd "${_pkgname%-git}"
echo "$(date +%Y%m%d).$(git rev-parse --short master)"
echo "$(date +%Y%m%d).$(git rev-list --count master).$(git rev-parse --short master)"
}

package() {
Expand Down
8 changes: 6 additions & 2 deletions pkgtools.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
is_update_from() {
res="`vercmp $1 $2`"
case $res in
res="$(vercmp $1 $2)"
case "$res" in
'-1'|'0') return 0;;
'1') return 1;;
esac
Expand All @@ -23,6 +23,10 @@ post_upgrade() {
if is_update_from $2 22-1; then
echo " - This is the largest release in a long time. This updates all Python scripts to Python 3."
fi
if is_update_from $2 24-1; then
echo " - This update removes the gem2arch and pkgfile scripts. This update also updates pkgconflict to work with pkgfile from [extra] and other minor fixes."
echo " - You may want to remove /var/cache/pkgtools/lists, which is no longer used."
fi
}

## arg 1: the old package version
Expand Down