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 1952 by niro, Fri Oct 12 12:59:32 2012 UTC revision 1963 by niro, Fri Oct 26 21:14:51 2012 UTC
    # Line 1605  syncmage_tarball() Line 1605  syncmage_tarball()
    1605   then   then
    1606   if ! mcheckemptydir ${MAGEDIR}   if ! mcheckemptydir ${MAGEDIR}
    1607   then   then
    1608   find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xarg --no-run-if-empty rm -r   find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xargs --no-run-if-empty rm -r
    1609   fi   fi
    1610   else   else
    1611   rm -rf ${MAGEDIR}   rm -rf ${MAGEDIR}
    # Line 1887  count_protected_files() Line 1887  count_protected_files()
    1887   count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"   count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"
    1888   done   done
    1889    
    1890   # dirty hack to convert 0001 -> 1; 0120 -> 120 etc   # convert 0001 -> 1; 0120 -> 120 etc
    1891   x="${#count}"   # use bash internal base functions to this task
    1892     x="$((10#${count}))"
    1893   for (( i=0; i<x; i++ ))   for (( i=0; i<x; i++ ))
    1894   do   do
    1895   if [[ ${count:${i}:1} != 0 ]]   if [[ ${count:${i}:1} != 0 ]]
    # Line 3119  pkgsearch() Line 3120  pkgsearch()
    3120   "") continue;;   "") continue;;
    3121   esac   esac
    3122    
    3123   deps="${deps} $(basename ${dep%-*})"   if [[ -z ${deps} ]]
    3124     then
    3125     deps="$(basename ${dep%-*})"
    3126     else
    3127     deps="${deps} $(basename ${dep%-*})"
    3128     fi
    3129   done << EOF   done << EOF
    3130  ${depsfull}  ${depsfull}
    3131  EOF  EOF
    # Line 3130  EOF Line 3136  EOF
    3136   "") continue;;   "") continue;;
    3137   esac   esac
    3138    
    3139   sdeps="${sdeps} $(basename ${dep%-*})"   if [[ -z ${sdeps} ]]
    3140     then
    3141     sdeps="$(basename ${dep%-*})"
    3142     else
    3143     sdeps="${sdeps} $(basename ${dep%-*})"
    3144     fi
    3145   done << EOF   done << EOF
    3146  ${sdepsfull}  ${sdepsfull}
    3147  EOF  EOF
    # Line 3144  EOF Line 3155  EOF
    3155   then   then
    3156   echo "      License:  ${license}"   echo "      License:  ${license}"
    3157   fi   fi
    3158   echo "      Depends: ${deps}"   echo "      Depends:  ${deps}"
    3159   echo "      SDepends: ${sdeps}"   echo "      SDepends: ${sdeps}"
    3160   echo   echo
    3161    
    Legend:
    Removed from v.1952  
    changed lines
      Added in v.1963