Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=37bc68fb8a1762fc89744f11b29d9909d1eee9df
commit 37bc68fb8a1762fc89744f11b29d9909d1eee9df Author: James Buren <[EMAIL PROTECTED]> Date: Fri Sep 19 09:51:08 2008 -0500 rox.sh * remove variable addition from last commit, replace with a more logical approach diff --git a/source/include/rox.sh b/source/include/rox.sh index 04bb946..4b8640e 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -45,8 +45,6 @@ # path # * _F_rox_sep - used to change the seperator between version and # $_F_rox_name, if applicable. -# * _F_rox_sourceforge_override - set to 1 if you wish to manually specify -# _F_sourceforge_name and _F_sourceforge_realname, defaults to 0 ### [ -z "$_F_rox_name" ] && _F_rox_name=$pkgname @@ -57,7 +55,6 @@ [ -z "$_F_rox_use_rox4debian" ] && _F_rox_use_rox4debian=0 [ -z "$_F_rox_use_hayber" ] && _F_rox_use_hayber=0 [ -z "$_F_rox_hayber_subdir" ] && _F_rox_hayber_subdir=$pkgname -[ -z "$_F_rox_sourceforge_override" ] && _F_rox_sourceforge_override=0 if echo $pkgname | grep -q lib; then _F_rox_installpath=/usr/lib/ else @@ -76,10 +73,8 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" if [ "$_F_rox_use_sourceforge" -eq 1 ]; then _F_sourceforge_dirname=rox - if [ "$_F_rox_sourceforge_override" -eq 0 ]; then - _F_sourceforge_name=$_F_rox_name - _F_sourceforge_realname=$_F_rox_name - fi + [ -z "$_F_sourceforge_realname" ] && _F_sourceforge_realname="$_F_rox_name" + [ -z "$_F_sourceforge_name" ] && _F_sourceforge_name="$_F_rox_name" Finclude sourceforge unset url fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
