summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangjiezhe2015-10-27 19:59:51 +0800
committerwangjiezhe2015-10-27 19:59:51 +0800
commit30897f97edf482cc2453a5e5b54657dd48d115ed (patch)
treed1f25889e4ef3e906e29f9f68997d0fdded4026b
parent58c6adcb95ffc5bb15c25c89e86d54887110b491 (diff)
downloadaur-30897f97edf482cc2453a5e5b54657dd48d115ed.tar.gz
Use _octave_run
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--octave-ga.install8
3 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4b3ec0c9b7dc..b35570c3e23d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = octave-ga
pkgdesc = Genetic optimization code
pkgver = 0.10.0
- pkgrel = 1
+ pkgrel = 2
url = http://octave.sourceforge.net/ga/
install = octave-ga.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 2ab935f5aad4..b2961c282db5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_pack=ga
pkgname=octave-$_pack
pkgver=0.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="Genetic optimization code"
arch=(any)
url="http://octave.sourceforge.net/$_pack/"
@@ -27,6 +27,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
noextract=("$_archive")
md5sums=('ecf6582ff0f5c81d0c166f3fc9ccfc25')
+_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-ga.install b/octave-ga.install
index a78be6d05cea..b680601cc1c6 100644
--- a/octave-ga.install
+++ b/octave-ga.install
@@ -1,7 +1,11 @@
_pack=ga
+_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"
}