Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d9e0bc6f693298fce3e896884cbfec659700b068
commit d9e0bc6f693298fce3e896884cbfec659700b068
Author: Michel Hermier <herm...@frugalware.org>
Date: Sun Jun 15 18:39:55 2014 +0200
util.sh: Revert previous regex changes cause problem in chkworld, remove regexp
duplication in Flastarchive.
diff --git a/source/include/util.sh b/source/include/util.sh
index 351df08..fb97fae 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -1417,7 +1417,7 @@ Flastarchive() {
local filter lynx="lynx -dump"
if [ -z "$_F_archive_nolinksonly" ]; then
- lynx="$lynx -listonly"
+ lynx+=" -listonly"
fi
if [ -n "$_F_archive_grep" ]; then
@@ -1429,11 +1429,13 @@ Flastarchive() {
# eval "$lynx \"$1\" $filter" | Flastarchive "$2" # possible
optimisation
Fwcat "$1" | eval "$lynx -stdin $filter" | Flastarchive "$2"
else
+ local
_Flastarchive_regex="s:.*/$_F_archive_name$Fpkgversep\([^/]*\)\($1\)[^/]*$:\1:p"
+
if [ -z "$_F_archive_nosort" ]; then
- sed -n
"s:.*/$_F_archive_name$Fpkgversep\(.*\)\($1\).*:\1:p" \
+ sed -n "$_Flastarchive_regex" \
| Fsort | tail -n1 | Fsanitizeversion
else
- sed -n
"s:.*/$_F_archive_name$Fpkgversep\(.*\)\($1\).*:\1:p" \
+ sed -n "$_Flastarchive_regex" \
| tail -n1 | Fsanitizeversion
fi
fi
@@ -1444,7 +1446,7 @@ Flastarchive() {
# Parameters: 1) url (optional) see Flastarchive
###
Flastdir() {
- local _Flastdir_regex='/\{0,1\}'
+ local _Flastdir_regex='/'
if [ -z "$1" ]; then
Flastarchive "$_Flastdir_regex"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
