diff options
author | wangjiezhe | 2015-10-27 21:19:55 +0800 |
---|---|---|
committer | wangjiezhe | 2015-10-27 21:19:55 +0800 |
commit | 6c7a36a2a3c4a8ce1d0e6ff9d76a5829ee7c6fad (patch) | |
tree | f771f8d4add30ee80e0eb763b5426fa53554483e | |
parent | 9fb4dda8a189c834e5b3a237bb5ffc73b4a9f84d (diff) | |
download | aur-6c7a36a2a3c4a8ce1d0e6ff9d76a5829ee7c6fad.tar.gz |
Use _octave_run
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | octave-mapping.install | 8 |
3 files changed, 13 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = octave-mapping pkgdesc = Simple Mapping and GIS .shp file functions. pkgver = 1.2.0 - pkgrel = 1 + pkgrel = 2 url = http://octave.sourceforge.net/mapping/ install = octave-mapping.install arch = any @@ -10,7 +10,7 @@ _pack=mapping pkgname=octave-$_pack pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple Mapping and GIS .shp file functions." arch=(any) url="http://octave.sourceforge.net/$_pack/" @@ -27,6 +27,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive") noextract=("$_archive") md5sums=('b4545c37b2191d6c397348e77a8db1c5') +_octave_run() { + octave --no-history --no-init-file --no-window-system -q -f --eval "$*" +} + _install_dir() { src=$1 dst=$2 @@ -39,7 +43,7 @@ build() { _archprefix="$srcdir"/install_archprefix mkdir -p "$_prefix" "$_archprefix" cd "$srcdir" - octave-cli -q -f --eval "$(cat <<-EOF + _octave_run "$(cat <<-EOF pkg local_list octave_packages; pkg prefix $_prefix $_archprefix; pkg install -verbose -nodeps $_archive; diff --git a/octave-mapping.install b/octave-mapping.install index caa09ffab45b..eb42b5f847ac 100644 --- a/octave-mapping.install +++ b/octave-mapping.install @@ -1,7 +1,11 @@ _pack=mapping +_octave_run() { + octave --no-history --no-init-file --no-window-system -q -f --eval "$*" +} + post_install() { - octave-cli -q -f --eval "pkg rebuild -global $_pack" + _octave_run "pkg rebuild -global $_pack" } post_upgrade() { @@ -9,5 +13,5 @@ post_upgrade() { } post_remove() { - octave-cli -q -f --eval "pkg rebuild -global" + _octave_run "pkg rebuild -global" } |