Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/mage4.functions.sh

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

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

    revision 942 by niro, Fri Nov 20 21:53:33 2009 UTC revision 943 by niro, Fri Nov 20 22:39:11 2009 UTC
    # Line 2160  get_value_from_magefile() Line 2160  get_value_from_magefile()
    2160   local SDEPEND   local SDEPEND
    2161   local PROVIDE   local PROVIDE
    2162   local PKGTYPE   local PKGTYPE
    2163     local MAGE_TARGETS
    2164     local SPLIT_PACKAGE_BASE
    2165   local preinstall   local preinstall
    2166   local postinstall   local postinstall
    2167   local preremove   local preremove
    # Line 2280  mage_install() Line 2282  mage_install()
    2282   echo B:${pbuild}   echo B:${pbuild}
    2283   fi   fi
    2284    
    2285   if [[ -z ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
    2286   then   then
    2287   # basic svn compat   # basic svn compat
    2288   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
    2289   then   then
    2290   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
    2291   do   do
    2292   smage2file="${i}"   smage2file="${i}"
    2293   done   done
    2294   else   else
    2295   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2   smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
    2296     fi
    2297    
    2298     elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
    2299     then
    2300     # basic svn compat
    2301     if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
    2302     then
    2303     for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
    2304     do
    2305     smage2file="${i}"
    2306     done
    2307     else
    2308     smage2file=${SMAGESCRIPTSDIR}/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
    2309   fi   fi
    2310    
    2311   else   else
    2312   # basic svn compat   # basic svn compat
    2313   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
    2314   then   then
    2315   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
    2316   do   do
    2317   smage2file="${i}"   smage2file="${i}"
    2318   done   done
    2319   else   else
    2320   smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
    2321   fi   fi
    2322   fi   fi
    2323    
    2324   if [ -f "${smage2file}" ]   if [ -f "${smage2file}" ]
    2325   then   then
    2326   echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "   echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
    Legend:
    Removed from v.942  
    changed lines
      Added in v.943