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

commit e7ddf7ba91317f3c113e527653b2e8963729ea21
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sat Jan 22 15:10:21 2011 +0100

util.sh

* Don't overwrite _F_kde_folder if allready set.
* Use _F_kde_pkgver in dir name instead of _F_kde_ver (follow pkg
version convention)

diff --git a/source/include/kde.sh b/source/include/kde.sh
index 4d44446..5a343c8 100644
--- a/source/include/kde.sh
+++ b/source/include/kde.sh
@@ -64,14 +64,16 @@ if [ -z "$_F_kde_mirror" ]; then
_F_kde_mirror="ftp://ftp.kde.org/pub/kde";
fi

-if [ -z "$_F_kde_unstable" ]; then
-       _F_kde_folder="stable"
-else
-       _F_kde_folder="unstable"
+if [ -z "$_F_kde_folder" ]; then
+       if [ -z "$_F_kde_unstable" ]; then
+               _F_kde_folder="stable"
+       else
+               _F_kde_folder="unstable"
+       fi
fi

if [ -z "$_F_kde_dirname" ]; then
-       _F_kde_dirname="$_F_kde_folder/$_F_kde_ver/src"
+       _F_kde_dirname="$_F_kde_folder/$_F_kde_pkgver/src"
fi

if [ -n "$_F_kde_final" ]; then
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to