Use _octave_run

3 files changed, 13 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6929878066f8..cf201a6fb651 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = octave-windows
 	pkgdesc = Provides COM interface and additional functionality on Windows
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://octave.sourceforge.net/windows/
 	install = octave-windows.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index fce84757fb00..abbd35656b6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 _pack=windows
 pkgname=octave-$_pack
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides COM interface and additional functionality on Windows"
 arch=(any)
 url="http://octave.sourceforge.net/$_pack/"
@@ -27,6 +27,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
 noextract=("$_archive")
 md5sums=('acde19e4e7d8f6c3a3e48a98870c9f87')
 
+_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-windows.install b/octave-windows.install
index fb4242ad5e76..2fb76a33b878 100644
--- a/octave-windows.install
+++ b/octave-windows.install
@@ -1,7 +1,11 @@
 _pack=windows
 
+_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"
 }