summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangjiezhe2015-10-27 18:45:20 +0800
committerwangjiezhe2015-10-27 18:45:20 +0800
commit7864ff32ac92c88ed8c7b0f76f9963ed3b03391d (patch)
treed7e5e40089eb5cd14ca2c90f26a34d2327125ff8
parent7d14252ebc73cefa6ddb47ee304930714bab0ccb (diff)
downloadaur-7864ff32ac92c88ed8c7b0f76f9963ed3b03391d.tar.gz
Use _octave_run
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--octave-fits.install8
3 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 889330ee4052..cfe1b5bc9273 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = octave-fits
pkgdesc = The Octave-FITS package provides functions for reading, and writing FITS (Flexible Image Transport System) files. This package uses the libcfitsio library.
pkgver = 1.0.5
- pkgrel = 1
+ pkgrel = 2
url = http://octave.sourceforge.net/fits/
install = octave-fits.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index a1ec3f9379ae..9bf2ad7f9f11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_pack=fits
pkgname=octave-$_pack
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="The Octave-FITS package provides functions for reading, and writing FITS (Flexible Image Transport System) files. This package uses the libcfitsio library."
arch=(any)
url="http://octave.sourceforge.net/$_pack/"
@@ -27,6 +27,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
noextract=("$_archive")
md5sums=('098afad15ba7845ff6c5775ecd1648c2')
+_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-fits.install b/octave-fits.install
index d23ea395c375..0980344a21c8 100644
--- a/octave-fits.install
+++ b/octave-fits.install
@@ -1,7 +1,11 @@
_pack=fits
+_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"
}