summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangjiezhe2015-10-27 20:21:35 +0800
committerwangjiezhe2015-10-27 20:21:35 +0800
commit82ce59317e3372153191511ac8f9275c59ce8ab4 (patch)
treeeb3dcfc5e511b19b93293e3a3fabbfb9e8d8d8f4
parent195c9f006f99dc23c309d778e899cfaa443b5784 (diff)
downloadaur-82ce59317e3372153191511ac8f9275c59ce8ab4.tar.gz
Use _octave_run
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--octave-generate_html.install8
3 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0488ac551e24..a543e8737506 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = octave-generate_html
pkgdesc = This package provides functions for generating HTML pages that contain the help texts for a set of functions. The package is designed to be as general as possible, but also contains convenience functions for generating a set of pages for entire packages.
pkgver = 0.1.9
- pkgrel = 1
+ pkgrel = 2
url = http://octave.sourceforge.net/generate_html/
install = octave-generate_html.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index cc85817b5f70..bfb99e871a64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_pack=generate_html
pkgname=octave-$_pack
pkgver=0.1.9
-pkgrel=1
+pkgrel=2
pkgdesc="This package provides functions for generating HTML pages that contain the help texts for a set of functions. The package is designed to be as general as possible, but also contains convenience functions for generating a set of pages for entire packages."
arch=(any)
url="http://octave.sourceforge.net/$_pack/"
@@ -27,6 +27,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
noextract=("$_archive")
md5sums=('322974d6724e4d3062fa7b44a2ab0e9f')
+_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-generate_html.install b/octave-generate_html.install
index df760d017d03..888d844ba285 100644
--- a/octave-generate_html.install
+++ b/octave-generate_html.install
@@ -1,7 +1,11 @@
_pack=generate_html
+_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"
}