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 1318 by niro, Fri May 27 19:48:35 2011 UTC revision 1541 by niro, Tue Dec 20 12:58:32 2011 UTC
    # Line 1365  syncmage() Line 1365  syncmage()
    1365   done   done
    1366    
    1367   # clean up backup files (foo~)   # clean up backup files (foo~)
    1368   find ${MAGEDIR} -name *~ -exec rm '{}' ';'   find ${MAGEDIR} -name \*~ -exec rm '{}' ';'
    1369    
    1370   # check if a newer mage version is available   # check if a newer mage version is available
    1371   is_newer_mage_version_available   is_newer_mage_version_available
    # Line 1575  get_highest_magefile() Line 1575  get_highest_magefile()
    1575   local magefile   local magefile
    1576    
    1577   # do not list the content of a directory, only the name (-d)   # do not list the content of a directory, only the name (-d)
    1578   for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/*)   for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/* 2> /dev/null)
    1579   do   do
    1580   [[ -z ${magefile} ]] && continue   [[ -z ${magefile} ]] && continue
    1581   # we exclude subdirs (for stuff like a md5sum dir)   # we exclude subdirs (for stuff like a md5sum dir)
    # Line 2462  mage_install() Line 2462  mage_install()
    2462   if [[ -n ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
    2463   then   then
    2464   # basic svn compat   # basic svn compat
    2465   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]   if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
    2466   then   then
    2467   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2   for i in ${SMAGESCRIPTSDIR}/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
    2468   do   do
    2469   smage2file="${i}"   smage2file="${i}"
    2470   done   done
    # Line 2475  mage_install() Line 2475  mage_install()
    2475   elif [[ -n ${SPLIT_PACKAGE_BASE} ]]   elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
    2476   then   then
    2477   # basic svn compat   # basic svn compat
    2478   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]   if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
    2479   then   then
    2480   for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2   for i in ${SMAGESCRIPTSDIR}/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
    2481   do   do
    2482   smage2file="${i}"   smage2file="${i}"
    2483   done   done
    # Line 2487  mage_install() Line 2487  mage_install()
    2487    
    2488   else   else
    2489   # basic svn compat   # basic svn compat
    2490   if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]   if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
    2491   then   then
    2492   for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2   for i in ${SMAGESCRIPTSDIR}/*/${pname}/${pname}-${pver}-${pbuild}.smage2
    2493   do   do
    2494   smage2file="${i}"   smage2file="${i}"
    2495   done   done
    # Line 3128  busybox_filter_wget_options() Line 3128  busybox_filter_wget_options()
    3128   echo "${opts}"   echo "${opts}"
    3129   fi   fi
    3130  }  }
    3131    
    3132    have_root_privileges()
    3133    {
    3134     local retval
    3135    
    3136     if [[ $(id -u) = 0 ]]
    3137     then
    3138     retval=0
    3139     else
    3140     retval=1
    3141     fi
    3142    
    3143     return ${retval}
    3144    }
    Legend:
    Removed from v.1318  
    changed lines
      Added in v.1541