summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangjiezhe2015-10-28 17:33:51 +0800
committerwangjiezhe2015-10-28 17:33:51 +0800
commite49ab23d692961b2ae6b9090d2a4645a4b22600f (patch)
tree0cd721e6da09e341ef97c16b78aaa89b26c0113c
parent763516092f744dfb7b55e06e73b8079583dca76d (diff)
downloadaur-e49ab23d692961b2ae6b9090d2a4645a4b22600f.tar.gz
Use _octave_run
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--octave-vrml.install8
3 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a71d5242ec72..d3644cfe07a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = octave-vrml
pkgdesc = 3D graphics using VRML
pkgver = 1.0.13
- pkgrel = 1
+ pkgrel = 2
url = http://octave.sourceforge.net/vrml/
install = octave-vrml.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 9d4f8e380e91..c1f6ef80aad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_pack=vrml
pkgname=octave-$_pack
pkgver=1.0.13
-pkgrel=1
+pkgrel=2
pkgdesc="3D graphics using VRML"
arch=(any)
url="http://octave.sourceforge.net/$_pack/"
@@ -27,6 +27,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
noextract=("$_archive")
md5sums=('79df290cea3f45e49eb58bfc664679b1')
+_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-vrml.install b/octave-vrml.install
index 09e290b06ca5..0db561ba429e 100644
--- a/octave-vrml.install
+++ b/octave-vrml.install
@@ -1,7 +1,11 @@
_pack=vrml
+_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"
}