summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangjiezhe2015-10-27 20:52:00 +0800
committerwangjiezhe2015-10-27 20:52:00 +0800
commitbda282064ddd4f26ffb09894a73177a4f50211cd (patch)
tree00f52d817e1f3a58e06481ad35bf54098df4efbe
parentef2aee4111ebc45a35529f84fc299cdb46ad8723 (diff)
downloadaur-bda282064ddd4f26ffb09894a73177a4f50211cd.tar.gz
Use _octave_run
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--octave-image-acquisition.install8
3 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 98d88d97456c..5dca0e596232 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = octave-image-acquisition
pkgdesc = The Octave-forge Image Aquisition package provides functions to capture images from connected devices. Currently only v4l2 is supported.
pkgver = 0.2.2
- pkgrel = 1
+ pkgrel = 2
url = http://octave.sourceforge.net/image-acquisition/
install = octave-image-acquisition.install
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 3e0d692f5b8c..ba15038f6761 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_pack=image-acquisition
pkgname=octave-$_pack
pkgver=0.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="The Octave-forge Image Aquisition package provides functions to capture images from connected devices. Currently only v4l2 is supported."
arch=(any)
url="http://octave.sourceforge.net/$_pack/"
@@ -27,6 +27,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
noextract=("$_archive")
md5sums=('60dc037554a3522705b24d34ea7c025f')
+_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-image-acquisition.install b/octave-image-acquisition.install
index 61d3c733260b..216e4ec94077 100644
--- a/octave-image-acquisition.install
+++ b/octave-image-acquisition.install
@@ -1,7 +1,11 @@
_pack=image-acquisition
+_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"
}