Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ddaea967ca10f2f980f9ccdd223a1f3bb004453d

commit ddaea967ca10f2f980f9ccdd223a1f3bb004453d
Author: Miklos Vajna <[email protected]>
Date:   Wed Oct 7 19:02:15 2009 +0200

Fsanitizeversion: add _F_archive_prefix

diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh
index 5b1f663..9b76167 100644
--- a/source/include/sourceforge.sh
+++ b/source/include/sourceforge.sh
@@ -98,6 +98,7 @@ if [ -z "$url" ]; then
url="$_F_sourceforge_url"
fi
_F_archive_name=$_F_sourceforge_name
+_F_archive_prefix=$_F_sourceforge_prefix
Fpkgversep=$_F_sourceforge_sep
up2date="Flastarchive 
http://sourceforge.net/projects/$_F_sourceforge_dirname/files 
$_F_sourceforge_ext"
source=(http://${_F_sourceforge_mirror}.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/"${_F_sourceforge_name}"${_F_sourceforge_sep}${_F_sourceforge_pkgver}${_F_sourceforge_ext})
diff --git a/source/include/util.sh b/source/include/util.sh
index e8b8307..1b15868 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -24,6 +24,7 @@
#
# == OPTIONS
# * _F_archive_name (defaults to $pkgname)
+# * _F_archive_prefix (defaults to "")
# * _F_archive_nolinksonly (defaults to no, so that only links are proceeded by
# default)
# * _F_archive_nosort (defaults to no, so sorting is enabled by default)
@@ -905,7 +906,7 @@ Fsanitizeversion() {
if [ $# -gt 0 ]; then
echo "$1" | Fsanitizeversion
else
-               sed "s/%2B/+/g;s/$pkgextraver$//;s/-/_/g"
+               sed "s/%2B/+/g;s/$pkgextraver$//;s/$_F_archive_prefix//;s/-/_/g"
fi
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to