Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/mage4.functions.sh

    Diff of /branches/mage-next/src/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 972 by niro, Thu Apr 22 12:22:39 2010 UTC
    # Line 1225  syncmage() Line 1225  syncmage()
    1225   # clean up backup files (foo~)   # clean up backup files (foo~)
    1226   find ${MAGEDIR} -name *~ -exec rm '{}' ';'   find ${MAGEDIR} -name *~ -exec rm '{}' ';'
    1227    
    1228   # check if an newer mage version is available   # check if a newer mage version is available
    1229   is_newer_mage_version_available   is_newer_mage_version_available
    1230  }  }
    1231    
    # Line 1278  syncmage_tarball() Line 1278  syncmage_tarball()
    1278   if [[ -d ${temp} ]]   if [[ -d ${temp} ]]
    1279   then   then
    1280   echo -ne "${COLBLUE} --- ${COLDEFAULT}"   echo -ne "${COLBLUE} --- ${COLDEFAULT}"
    1281   echo "clenaing temp-files ..."   echo "cleaning temp-files ..."
    1282   rm -rf ${temp}   rm -rf ${temp}
    1283   fi   fi
    1284    
    1285     # check if a newer mage version is available
    1286     is_newer_mage_version_available
    1287   else   else
    1288   die "Could not fetch the latest tarball ... aborting"   die "Could not fetch the latest tarball ... aborting"
    1289   fi   fi
    # Line 2160  get_value_from_magefile() Line 2163  get_value_from_magefile()
    2163   local SDEPEND   local SDEPEND
    2164   local PROVIDE   local PROVIDE
    2165   local PKGTYPE   local PKGTYPE
    2166     local MAGE_TARGETS
    2167     local SPLIT_PACKAGE_BASE
    2168   local preinstall   local preinstall
    2169   local postinstall   local postinstall
    2170   local preremove   local preremove
    # Line 2280  mage_install() Line 2285  mage_install()
    2285   echo B:${pbuild}   echo B:${pbuild}
    2286   fi   fi
    2287    
    2288   if [[ -z ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
    2289   then   then
    2290   # basic svn compat   # basic svn compat
    2291   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
    2292   then   then
    2293   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
    2294   do   do
    2295   smage2file="${i}"   smage2file="${i}"
    2296   done   done
    2297   else   else
    2298   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2   smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
    2299   fi   fi
    2300    
    2301     elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
    2302     then
    2303     # basic svn compat
    2304     if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
    2305     then
    2306     for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
    2307     do
    2308     smage2file="${i}"
    2309     done
    2310     else
    2311     smage2file=${SMAGESCRIPTSDIR}/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
    2312     fi
    2313    
    2314   else   else
    2315   # basic svn compat   # basic svn compat
    2316   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
    2317   then   then
    2318   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
    2319   do   do
    2320   smage2file="${i}"   smage2file="${i}"
    2321   done   done
    2322   else   else
    2323   smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
    2324   fi   fi
    2325   fi   fi
    2326    
    2327   if [ -f "${smage2file}" ]   if [ -f "${smage2file}" ]
    2328   then   then
    2329   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.972