diff options
| -rw-r--r-- | pcr/octave-general/PKGBUILD | 12 | ||||
| -rw-r--r-- | pcr/octave-general/octave-general.install | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/pcr/octave-general/PKGBUILD b/pcr/octave-general/PKGBUILD index fb720bb27..690981d14 100644 --- a/pcr/octave-general/PKGBUILD +++ b/pcr/octave-general/PKGBUILD @@ -9,14 +9,14 @@ _pack=general pkgname=octave-$_pack -pkgver=1.3.4 +pkgver=2.0.0 pkgrel=2 pkgdesc="General tools for Octave." arch=(any) url="http://octave.sourceforge.net/$_pack/" license=('custom') groups=('octave-forge') -depends=('octave>=3.4.3') +depends=('octave>=4.0.0') makedepends=() optdepends=() backup=() @@ -25,7 +25,11 @@ install=$pkgname.install _archive=$_pack-$pkgver.tar.gz source=("http://downloads.sourceforge.net/octave/$_archive") noextract=("$_archive") -md5sums=('f94fffe8bc7bfe83d525528ddd04c3c8') +md5sums=('81514b9d133b8013ae2b394f7aa6e16b') + +_octave_run() { + octave --no-history --no-init-file --no-window-system -q -f --eval "$*" +} _install_dir() { src=$1 @@ -39,7 +43,7 @@ build() { _archprefix="$srcdir"/install_archprefix mkdir -p "$_prefix" "$_archprefix" cd "$srcdir" - octave -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/pcr/octave-general/octave-general.install b/pcr/octave-general/octave-general.install index 25d38ea9e..d5ac2192f 100644 --- a/pcr/octave-general/octave-general.install +++ b/pcr/octave-general/octave-general.install @@ -1,7 +1,11 @@ _pack=general +_octave_run() { + octave --no-history --no-init-file --no-window-system -q -f --eval "$*" +} + post_install() { - octave -q -f --eval "pkg rebuild -global $_pack" + _octave_run "pkg rebuild -global $_pack" } post_upgrade() { @@ -9,5 +13,5 @@ post_upgrade() { } post_remove() { - octave -q -f --eval "pkg rebuild -global" + _octave_run "pkg rebuild -global" } |