summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnafu2018-08-28 17:52:50 +0200
committersnafu2018-08-28 17:52:50 +0200
commit84423104b6a9ba33d15279d5ead8d8aee564afe9 (patch)
tree1ae858094a05930029ae31a2c81af496b6867ec6
parent259692fb7ba354a62349c13b49c1d8325a50a38c (diff)
downloadaur-84423104b6a9ba33d15279d5ead8d8aee564afe9.tar.gz
version bump to 4.1.4
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--zshcomp.patch25
3 files changed, 17 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 52e60fae8327..bb256c8cfd1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = env-modules
pkgdesc = Provides for an easy dynamic modification of a user's environment via modulefile.
- pkgver = 4.1.2
+ pkgver = 4.1.4
pkgrel = 1
url = https://sourceforge.net/projects/modules/
install = env-modules.install
@@ -12,10 +12,10 @@ pkgbase = env-modules
conflicts = env-modules-tcl
replaces = env-modules-tcl
backup = etc/modules/init/modulerc
- source = https://sourceforge.net/projects/modules/files/Modules/modules-4.1.2/modules-4.1.2.tar.gz
+ source = https://sourceforge.net/projects/modules/files/Modules/modules-4.1.4/modules-4.1.4.tar.gz
source = zshcomp.patch
- md5sums = e6e9ce6774c557f3f825baa35c7780fd
- md5sums = 5b4c34fac86b88c96a092c5972afa1fe
+ md5sums = c19bff662003fad79f92a89b9ad47139
+ md5sums = 48195d9f1c157c17b5c07e3997739f9c
pkgname = env-modules
diff --git a/PKGBUILD b/PKGBUILD
index 47b7f4c4c9e2..149e63928bfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: snafu
pkgname=env-modules
-pkgver=4.1.2
+pkgver=4.1.4
pkgrel=1
epoch=
pkgdesc="Provides for an easy dynamic modification of a user's environment via modulefile."
@@ -21,8 +21,8 @@ changelog=
source=("https://sourceforge.net/projects/modules/files/Modules/modules-$pkgver/modules-$pkgver.tar.gz" zshcomp.patch)
noextract=()
validpgpkeys=()
-md5sums=('e6e9ce6774c557f3f825baa35c7780fd'
- '5b4c34fac86b88c96a092c5972afa1fe')
+md5sums=('c19bff662003fad79f92a89b9ad47139'
+ '48195d9f1c157c17b5c07e3997739f9c')
# Install locations:
install_prefix=/usr
diff --git a/zshcomp.patch b/zshcomp.patch
index 9720da002efa..eaaad5c807c1 100644
--- a/zshcomp.patch
+++ b/zshcomp.patch
@@ -1,7 +1,5 @@
-diff --git a/init/zsh-functions/_module b/init/zsh-functions/_module
-index 45042d1..a1c686a 100644
--- a/init/zsh-functions/_module
-+++ b/init/zsh-functions/_module
++++ a/init/zsh-functions/_module
@@ -4,17 +4,35 @@
# Zsh command-line completion for module
# Copyright (C) 2017 Xavier Delaruelle <xavier.delaruelle@cea.fr>
@@ -48,30 +46,27 @@ index 45042d1..a1c686a 100644
}
_module_savelist() {
-@@ -24,18 +42,15 @@ _module_savelist() {
+@@ -24,16 +42,13 @@ _module_savelist() {
/:ERROR:/d;'
}
-_module_not_yet_loaded() {
-- _module_avail | sort | sed -r "\%^(${LOADEDMODULES//:/|})$%d"
+- _module_avail | sort | sed -E "\%^(${LOADEDMODULES//:/|})$%d"
-}
--
--
++_module_all_mods() {
++ _module_completion
++ }
+
+
_module_avail_mods() {
- local -a avail_mods;
- avail_mods=(${$(_module_avail)})
-+ _module_completion dir
-+}
-
+-
- _describe -t avail-mods 'available modulefiles' avail_mods && ret=0
-+_module_all_mods() {
-+ _module_completion
++ _module_completion dir
}
-+
_module_saved_colls() {
- local -a saved_colls;
- saved_colls=(${$(_module_savelist)})
@@ -44,10 +59,8 @@ _module_saved_colls() {
}