Use _octave_run

3 files changed, 13 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d3b26f9282d..c3591a204a8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = octave-fl-core
 	pkgdesc = The package contains code for basic functions in Fuzzy Logic for Octave.
 	pkgver = 1.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://octave.sourceforge.net/fl-core/
 	install = octave-fl-core.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 44c808a12977..ea79eacd3d15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 _pack=fl-core
 pkgname=octave-$_pack
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The package contains code for basic functions in Fuzzy Logic for Octave."
 arch=(any)
 url="http://octave.sourceforge.net/$_pack/"
@@ -30,6 +30,10 @@ noextract=("$_archive")
 md5sums=('930dd490d1d306e361a8529cb4c8ce54'
          'ccc0b8e4e4d694ab4f6128e92eb67c33')
 
+_octave_run() {
+	octave --no-history --no-init-file --no-window-system -q -f --eval "$*"
+}
+
 _install_dir() {
 	src=$1
 	dst=$2
@@ -49,7 +53,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_patched;
diff --git a/octave-fl-core.install b/octave-fl-core.install
index 4377e609be7a..10db1d1e6103 100644
--- a/octave-fl-core.install
+++ b/octave-fl-core.install
@@ -1,7 +1,11 @@
 _pack=fl-core
 
+_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"
 }