From 78ebd0c1e742d1cf1ac28be9a0728c1004481579 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Mon, 10 Mar 2014 15:35:05 +0100 Subject: [PATCH 1/3] adopted and updated autojump-git PKGBUILD --- .SRCINFO | 18 ++++++++++++++++++ PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ install | 6 ++++++ 3 files changed, 65 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD create mode 100644 install diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..c5398b4 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,18 @@ +pkgbase = autojump-git + pkgdesc = A faster way to navigate your filesystem from the command line + pkgver = release.v21.6.9.149.g72313db + pkgrel = 1 + url = http://github.com/joelthelion/autojump + install = install + arch = any + license = GPL3 + makedepends = git + depends = bash + depends = python + provides = autojump + conflicts = autojump + source = git+https://github.com/joelthelion/autojump.git + md5sums = SKIP + +pkgname = autojump-git + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..d88870b --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Cedric Girard +# Contributor: Jason Axelson +# Contributor: Sean Escriva +# Contributor: William Ting + +pkgname=autojump-git +pkgver=release.v21.6.9.149.g72313db +pkgrel=1 +pkgdesc="A faster way to navigate your filesystem from the command line" +arch=(any) +url="http://github.com/joelthelion/autojump" +license=('GPL3') +depends=('bash' 'python') +makedepends=('git') +conflicts=('autojump') +provides=('autojump') +replaces=() +backup=() +source=('git+https://github.com/joelthelion/autojump.git') +md5sums=('SKIP') +install='install' + +_gitname="autojump" + +pkgver() { + cd ${_gitname} + git describe --always | sed 's|-|.|g' +} + +prepare() { + cd ${_gitname} + sed -i 's$#!/usr/bin/env python$#!/usr/bin/env python2$' bin/autojump bin/*.py +} + +package() { + cd ${_gitname} + /usr/bin/env python2 ./install.py --prefix 'usr/' --destdir "${pkgdir}" --zshshare 'usr/share/zsh/site-functions' +} + + +# vim:set ts=4 sw=4 et: diff --git a/install b/install new file mode 100644 index 0000000..fd8ec21 --- /dev/null +++ b/install @@ -0,0 +1,6 @@ +function post_install { + echo " > Please add the line to ~/.bashrc :" + echo " > [[ -s /etc/profile.d/autojump.bash ]] && . /etc/profile.d/autojump.bash" + echo " > Or substitute ~/.zshrc and /etc/profile.d/autojump.zsh" + echo " > You need to run 'source ~/.bashrc' before you can start using autojump." +} From 3ea8ed2b94b4dac94fd8de1d33bc3779fea95898 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Thu, 30 Jul 2015 15:36:01 +0200 Subject: [PATCH 2/3] use python3 and fix profile file --- .SRCINFO | 4 +--- PKGBUILD | 20 +++++++++++++++----- install | 6 ------ 3 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 install diff --git a/.SRCINFO b/.SRCINFO index c5398b4..a4aae50 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,11 @@ pkgbase = autojump-git pkgdesc = A faster way to navigate your filesystem from the command line - pkgver = release.v21.6.9.149.g72313db + pkgver = release.v21.7.1.191.g113a84f pkgrel = 1 url = http://github.com/joelthelion/autojump - install = install arch = any license = GPL3 makedepends = git - depends = bash depends = python provides = autojump conflicts = autojump diff --git a/PKGBUILD b/PKGBUILD index d88870b..3b578c4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,13 @@ # Contributor: William Ting pkgname=autojump-git -pkgver=release.v21.6.9.149.g72313db +pkgver=release.v21.7.1.191.g113a84f pkgrel=1 pkgdesc="A faster way to navigate your filesystem from the command line" arch=(any) url="http://github.com/joelthelion/autojump" license=('GPL3') -depends=('bash' 'python') +depends=('python') makedepends=('git') conflicts=('autojump') provides=('autojump') @@ -18,7 +18,6 @@ replaces=() backup=() source=('git+https://github.com/joelthelion/autojump.git') md5sums=('SKIP') -install='install' _gitname="autojump" @@ -29,12 +28,23 @@ pkgver() { prepare() { cd ${_gitname} - sed -i 's$#!/usr/bin/env python$#!/usr/bin/env python2$' bin/autojump bin/*.py + sed -i 's$#!/usr/bin/env python$#!/usr/bin/env python3$' bin/autojump bin/*.py } package() { cd ${_gitname} - /usr/bin/env python2 ./install.py --prefix 'usr/' --destdir "${pkgdir}" --zshshare 'usr/share/zsh/site-functions' + ./install.py --prefix 'usr/' --destdir "${pkgdir}" --zshshare 'usr/share/zsh/site-functions' + + cd "${pkgdir}"/usr/share/$_gitname + for i in $_gitname.* ; do + ln -s /usr/share/$_gitname/$i \ + "${pkgdir}"/etc/profile.d/$i + done + + #https://github.com/joelthelion/autojump/pull/339 + sed -i "s!/usr/local/!/usr/!g" "${pkgdir}"/etc/profile.d/$_gitname.sh + #FS#43762 + sed -i '27,31d' "${pkgdir}"/etc/profile.d/$_gitname.sh } diff --git a/install b/install deleted file mode 100644 index fd8ec21..0000000 --- a/install +++ /dev/null @@ -1,6 +0,0 @@ -function post_install { - echo " > Please add the line to ~/.bashrc :" - echo " > [[ -s /etc/profile.d/autojump.bash ]] && . /etc/profile.d/autojump.bash" - echo " > Or substitute ~/.zshrc and /etc/profile.d/autojump.zsh" - echo " > You need to run 'source ~/.bashrc' before you can start using autojump." -} From f34af1494901e1452ea703653403388878e97e01 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Wed, 18 May 2016 11:03:01 +0200 Subject: [PATCH 3/3] correct pkgver logic --- .SRCINFO | 4 +++- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a4aae50..834748a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Wed May 18 09:02:52 UTC 2016 pkgbase = autojump-git pkgdesc = A faster way to navigate your filesystem from the command line - pkgver = release.v21.7.1.191.g113a84f + pkgver = 22.3.0.r14.g9a6e286 pkgrel = 1 url = http://github.com/joelthelion/autojump arch = any diff --git a/PKGBUILD b/PKGBUILD index 3b578c4..3c206b1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: William Ting pkgname=autojump-git -pkgver=release.v21.7.1.191.g113a84f +pkgver=22.3.0.r14.g9a6e286 pkgrel=1 pkgdesc="A faster way to navigate your filesystem from the command line" arch=(any) @@ -23,7 +23,7 @@ _gitname="autojump" pkgver() { cd ${_gitname} - git describe --always | sed 's|-|.|g' + git describe --long --tags | sed 's/^release\-v//;s/\([^-]*-g\)/r\1/;s/-/./g' } prepare() {