Magellan Linux

Diff of /trunk/mage/usr/lib/mage/mage4.functions.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 603 by niro, Mon Nov 5 19:36:36 2007 UTC revision 676 by niro, Tue Feb 26 19:49:20 2008 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2  # Magellan Linux Installer Functions (mage.functions.sh)  # Magellan Linux Installer Functions (mage.functions.sh)
3  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.34 2007-11-05 19:34:36 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.36 2008-02-26 19:49:20 niro Exp $
4    
5  mage_setup()  mage_setup()
6  {  {
# Line 1315  get_highest_magefile() Line 1315  get_highest_magefile()
1315   local PNAME="$2"   local PNAME="$2"
1316   local magefile   local magefile
1317    
1318   for magefile in $(ls --format=single-column -v ${MAGEDIR}/${PCAT}/${PNAME}/*)   # do not list the content of a directory, only the name (-d)
1319     for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/*)
1320   do   do
1321     [[ -z ${magefile} ]] && continue
1322   # we exclude subdirs (for stuff like a md5sum dir)   # we exclude subdirs (for stuff like a md5sum dir)
1323   [ -d ${magefile} ] && continue   [[ -d ${magefile} ]] && continue
1324   if check_stable_package ${magefile}   if check_stable_package ${magefile}
1325   then   then
1326   HIGHEST_MAGEFILE=${magefile}   HIGHEST_MAGEFILE=${magefile}
# Line 2177  mage_install() Line 2179  mage_install()
2179   echo B:${pbuild}   echo B:${pbuild}
2180   fi   fi
2181    
2182   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2   if [[ -z ${MAGE_TARGETS} ]]
2183     then
2184     smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
2185     else
2186     smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
2187     fi
2188   if [ -f "${smage2file}" ]   if [ -f "${smage2file}" ]
2189   then   then
2190   echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "   echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "

Legend:
Removed from v.603  
changed lines
  Added in v.676