Magellan Linux

Diff of /branches/mage-next/src/mage4.functions.sh.in

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

trunk/mage/usr/lib/mage/mage4.functions.sh revision 1781 by niro, Mon Mar 12 23:21:52 2012 UTC branches/mage-next/src/mage4.functions.sh.in revision 2753 by niro, Thu Aug 14 14:29:11 2014 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.38 2008-10-05 10:32:24 niro Exp $  # $Id$
   
 COLRED="\033[1;6m\033[31m"  
 COLGREEN="\033[1;6m\033[32m"  
 COLYELLOW="\033[1;6m\033[33m"  
 COLBLUE="\033[1;6m\033[34m"  
 COLMAGENTA="\033[1;6m\033[35m"  
 COLWHITE="\033[1;6m\033[37m"  
 COLGRAY="\033[0;6m\033[37m"  
 COLBOLD="\033[1m"  
 COLDEFAULT="\033[0m"  
   
 if [[ ${NOCOLORS} = true ]]  
 then  
  COLRED=""  
  COLGREEN=""  
  COLYELLOW=""  
  COLBLUE=""  
  COLMAGENTA=""  
  COLWHITE=""  
  COLGRAY=""  
  COLBOLD=""  
  COLDEFAULT=""  
 fi  
4    
5  mage_setup()  mage_setup()
6  {  {
# Line 46  mchecksum() Line 23  mchecksum()
23   local method   local method
24   local cmd   local cmd
25   local retval   local retval
26     local sum
27     local dest
28    
29   # very basic getops   # very basic getops
30   for i in $*   for i in $*
# Line 72  mchecksum() Line 51  mchecksum()
51   if [[ -d ${rundir} ]]   if [[ -d ${rundir} ]]
52   then   then
53   pushd ${rundir} &> /dev/null   pushd ${rundir} &> /dev/null
54   # be verbose here  
55   ${cmd} -c ${file} #&> /dev/null   # all file must be non-zero
56   retval="$?"   retval=0
57     while read sum dest
58     do
59     if [ ! -s ${dest} ]
60     then
61     echo "${dest}: file is empty ;("
62     retval=127
63     fi
64     done < ${file}
65     if [[ ${retval} != 127 ]]
66     then
67     # be verbose here
68     ${cmd} -c ${file} #&> /dev/null
69     retval="$?"
70     fi
71    
72   popd &> /dev/null   popd &> /dev/null
73   else   else
74   retval=1   retval=1
# Line 102  mcheckemptydir() Line 96  mcheckemptydir()
96   return ${retval}   return ${retval}
97  }  }
98    
99    unpack_package()
100    {
101     local magefile="$1"
102     local pkgname
103     local pkgfile
104     local pkgtype
105     local tar_opts
106    
107     pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
108     pkgfile="${pkgname}.${PKGSUFFIX}"
109     pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
110    
111     xtitle "[ Unpacking ${pkg} ]"
112    
113     # abort on virtual pkg
114     if [[ ${pkgtype} = virtual ]]
115     then
116     echo -ne " ${COLBLUE}---${COLDEFAULT}"
117     echo " !unpack virtual ${pkgname} ... "
118     continue
119     fi
120    
121     # abort on sources pkg
122     if [[ ${pkgtype} = sources ]]
123     then
124     echo -ne " ${COLBLUE}---${COLDEFAULT}"
125     echo " !unpack sources ${pkgname} ... "
126     continue
127     fi
128    
129     # busybox?
130     if need_busybox_support tar
131     then
132     tar_opts="xjf"
133     else
134     tar_opts="xjmf"
135     fi
136    
137     echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkgfile} ... "
138     tar ${tar_opts} ${PKGDIR}/${pkgfile} -C ${BUILDDIR} || die "Unpacking package ${pkgfile}"
139    }
140    
141  unpack_packages()  unpack_packages()
142  {  {
143   local list="$@"   local list="$@"
144   local magefile   local magefile
  local pkg  
  local pkgtype  
145   local count_current   local count_current
146   local count_total   local count_total
147   local tar_opts   local tar_opts
# Line 120  unpack_packages() Line 154  unpack_packages()
154    
155   for magefile in ${list}   for magefile in ${list}
156   do   do
157   pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   unpack_package "${magefile}"
  pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"  
   
158   (( count_current++ ))   (( count_current++ ))
  xtitle "[ (${count_current}/${count_total}) Unpacking ${pkg} ]"  
   
  # abort on virtual pkg  
  if [[ ${pkgtype} = virtual ]]  
  then  
  echo -ne " ${COLBLUE}---${COLDEFAULT}"  
  echo " !unpack virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "  
  continue  
  fi  
   
  # abort on sources pkg  
  if [[ ${pkgtype} = sources ]]  
  then  
  echo -ne " ${COLBLUE}---${COLDEFAULT}"  
  echo " !unpack sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "  
  continue  
  fi  
   
  # busybox?  
  if need_busybox_support tar  
  then  
  tar_opts="xjf"  
  else  
  tar_opts="xjmf"  
  fi  
   
  echo -e " ${COLBLUE}***${COLDEFAULT} unpacking (${count_current}/${count_total}): ${pkg} ... "  
  tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"  
159   done   done
160    
161   # add a crlf for a better view   # add a crlf for a better view
162   if [ ${count_total} -gt 1 ]; then echo; fi   if [ ${count_total} -gt 1 ]; then echo; fi
163  }  }
164    
   
165  # fix_mtime path/to/$mtime/reffile $pathto/file  # fix_mtime path/to/$mtime/reffile $pathto/file
166  # creates a given reference file and fixes given file  # creates a given reference file and fixes given file
167  # returns new mtime  # returns new mtime
# Line 734  remove_database_entry() Line 737  remove_database_entry()
737   [ ! -f ${magefile} ] && die "remove_database_entry() ${magefile} not exist."   [ ! -f ${magefile} ] && die "remove_database_entry() ${magefile} not exist."
738    
739   # remove virtuals only if no other exist   # remove virtuals only if no other exist
740   if [[ $(count_installed_pkgs --pcat ${pcat} --pname ${pname}) -le 1 ]]   if [[ $(count_installed_pkgs --pcat=${pcat} --pname=${pname}) -le 1 ]]
741   then   then
742   # first unregister virtuals   # first unregister virtuals
743   provide="$(get_value_from_magefile PROVIDE ${magefile})"   provide="$(get_value_from_magefile PROVIDE ${magefile})"
# Line 763  count_installed_pkgs() Line 766  count_installed_pkgs()
766   local i   local i
767    
768   # very basic getops   # very basic getops
769   for i in $*   for i in $@
770   do   do
771   case $1 in   case ${i} in
772   --pcat|-c) shift; pcat="$1" ;;   --pcat*) pcat="${i#*=}" ;;
773   --pname|-n) shift; pname="$1" ;;   --pname*) pname="${i#*=}" ;;
774   esac   esac
  shift  
775   done   done
776    
777   # sanity checks; abort if not given   # sanity checks; abort if not given
# Line 1376  convertmirrors() Line 1378  convertmirrors()
1378   output+="${mirror}${addon}/${uri/${scheme}/}"   output+="${mirror}${addon}/${uri/${scheme}/}"
1379   done   done
1380   else   else
1381   output="${uri}"   output="${uri}"
1382   fi   fi
1383    
1384   echo "${output}"   echo "${output}"
# Line 1443  fetch_packages() Line 1445  fetch_packages()
1445  {  {
1446   local i   local i
1447   local list="$@"   local list="$@"
1448   local pkg   local pkgname
1449     local pkgfile
1450     local pcat
1451     local pname
1452   local mirr   local mirr
1453   local magefile   local magefile
1454   local md5file   local md5file
# Line 1451  fetch_packages() Line 1456  fetch_packages()
1456   local count_current   local count_current
1457   local count_total   local count_total
1458   local wget_opts   local wget_opts
1459     local fetching
1460    
1461   [ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."   [ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."
1462    
# Line 1465  fetch_packages() Line 1471  fetch_packages()
1471    
1472   for magefile in ${list}   for magefile in ${list}
1473   do   do
1474   pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
1475     pkgfile="${pkgname}.${PKGSUFFIX}"
1476   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
1477    
1478     pcat=$(magename2pcat ${magefile})
1479     pname=$(magename2pname ${magefile})
1480     md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"
1481    
1482   (( count_current++ ))   (( count_current++ ))
1483   xtitle "[ (${count_current}/${count_total}) Fetching ${pkg} ]"   xtitle "[ (${count_current}/${count_total}) Fetching ${pkgfile} ]"
1484    
1485   # abort on virtual pkg   # abort on virtual pkg
1486   if [[ ${pkgtype} = virtual ]]   if [[ ${pkgtype} = virtual ]]
1487   then   then
1488   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
1489   echo " !fetch virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "   echo " !fetch virtual (${count_current}/${count_total}): ${pkgname} ... "
1490   continue   continue
1491   fi   fi
1492    
# Line 1483  fetch_packages() Line 1494  fetch_packages()
1494   if [[ ${pkgtype} = sources ]]   if [[ ${pkgtype} = sources ]]
1495   then   then
1496   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
1497   echo " !fetch sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "   echo " !fetch sources (${count_current}/${count_total}): ${pkgname} ... "
1498   continue   continue
1499   fi   fi
1500    
1501   # abort if already exist   # check if FETCHING is required
1502   if [ -f ${PKGDIR}/${pkg} ]   if [ ! -f "${md5file}" ]
1503     then
1504     fetching=true
1505     else
1506     if mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 &> /dev/null
1507     then
1508     # md5's ok, no fetching required
1509     fetching=false
1510     else
1511     fetching=true
1512     fi
1513     fi
1514    
1515     if [[ ${fetching} = false ]]
1516   then   then
1517   echo -ne " ${COLBLUE}***${COLDEFAULT}"   echo -ne " ${COLBLUE}***${COLDEFAULT}"
1518   echo " fetch complete (${count_current}/${count_total}): ${pkg} ... "   echo " fetch complete (${count_current}/${count_total}): ${pkgfile} ... "
1519   continue   continue
1520     else
1521     echo -ne " ${COLBLUE}***${COLDEFAULT}"
1522     echo -e " fetching (${count_current}/${count_total}): ${pkgfile} ... "
1523     mdownload --uri "package://${pkgfile}" --dir "${PKGDIR}" || die "Could not download ${pkgfile}"
1524   fi   fi
1525    
1526   echo -ne " ${COLBLUE}***${COLDEFAULT}"   # sanity check, not really needed but to be sure
1527   echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "   if [ ! -f ${PKGDIR}/${pkgfile} ]
  mdownload --uri "package://${pkg}" --dir "${PKGDIR}" || die "Could not download ${pkg}"  
  if [ ! -f ${PKGDIR}/${pkg} ]  
1528   then   then
1529   die "Package '${pkg}' after download not found in '${PKGDIR}'"   die "Package '${pkgfile}' after download not found in '${PKGDIR}'"
1530   fi   fi
1531   done   done
1532    
# Line 1605  syncmage_tarball() Line 1631  syncmage_tarball()
1631   then   then
1632   if ! mcheckemptydir ${MAGEDIR}   if ! mcheckemptydir ${MAGEDIR}
1633   then   then
1634   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
1635   fi   fi
1636   else   else
1637   rm -rf ${MAGEDIR}   rm -rf ${MAGEDIR}
# Line 1648  cleanpkg() Line 1674  cleanpkg()
1674   fi   fi
1675  }  }
1676    
 xtitle()  
 {  
  if [[ ${TERM} = xterm ]]  
  then  
  echo -ne "\033]0;Mage: $1\007"  
  fi  
  return 0  
 }  
   
   
 xtitleclean()  
 {  
  if [[ ${TERM} = xterm ]]  
  then  
  echo -ne "\033]0;\007"  
  fi  
  return 0  
 }  
   
   
1677  # unused?  # unused?
1678  #  #
1679  # # cuts full pathnames or versionized names down to basename  # # cuts full pathnames or versionized names down to basename
# Line 1763  get_highest_magefile() Line 1769  get_highest_magefile()
1769   then   then
1770   HIGHEST_MAGEFILE=${magefile}   HIGHEST_MAGEFILE=${magefile}
1771   #for debug only   #for debug only
1772   mqueryfeature "debug" && echo "HIGHEST_MAGEFILE=${HIGHEST_MAGEFILE}"   mqueryfeature "debug" && echo "HIGHEST_MAGEFILE=${HIGHEST_MAGEFILE}" >&2
1773   fi   fi
1774   done   done
1775    
# Line 1887  count_protected_files() Line 1893  count_protected_files()
1893   count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"   count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"
1894   done   done
1895    
1896   # dirty hack to convert 0001 -> 1; 0120 -> 120 etc   # convert 0001 -> 1; 0120 -> 120 etc
1897   x="${#count}"   # use bash internal base functions to this task
1898     x="$((10#${count}))"
1899   for (( i=0; i<x; i++ ))   for (( i=0; i<x; i++ ))
1900   do   do
1901   if [[ ${count:${i}:1} != 0 ]]   if [[ ${count:${i}:1} != 0 ]]
# Line 2204  sminclude() Line 2211  sminclude()
2211   then   then
2212   for i in $*   for i in $*
2213   do   do
2214   echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"   [[ ${SILENT} = 1 ]] || echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
2215   source ${SMAGESCRIPTSDIR}/include/${i}.sminc   source ${SMAGESCRIPTSDIR}/include/${i}.sminc
2216   done   done
2217   echo   [[ ${SILENT} = 1 ]] || echo
2218   fi   fi
2219  }  }
2220    
# Line 2234  is_newer_mage_version_available() Line 2241  is_newer_mage_version_available()
2241   fi   fi
2242  }  }
2243    
   
2244  # returns pname from pkgname  # returns pname from pkgname
2245  # pkgname2pname $PKGNAME  # pkgname2pname $PKGNAME
2246  pkgname2pname()  pkgname2pname()
# Line 2511  get_value_from_magefile() Line 2517  get_value_from_magefile()
2517   local SDEPEND   local SDEPEND
2518   local PROVIDE   local PROVIDE
2519   local PKGTYPE   local PKGTYPE
  local MAGE_TARGETS  
2520   local SPLIT_PACKAGE_BASE   local SPLIT_PACKAGE_BASE
2521   local preinstall   local preinstall
2522   local postinstall   local postinstall
# Line 2633  mage_install() Line 2638  mage_install()
2638   echo B:${pbuild}   echo B:${pbuild}
2639   fi   fi
2640    
2641   if [[ -n ${MAGE_TARGETS} ]]   if [[ -n ${SPLIT_PACKAGE_BASE} ]]
  then  
  # basic svn compat  
  if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]  
  then  
  for i in ${SMAGESCRIPTSDIR}/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2  
  do  
  smage2file="${i}"  
  done  
  else  
  smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2  
  fi  
   
  elif [[ -n ${SPLIT_PACKAGE_BASE} ]]  
2642   then   then
2643   # basic svn compat   # basic svn compat
2644   if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]   if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
# Line 2688  mage_install() Line 2680  mage_install()
2680   if [[ ${PKGTYPE} != virtual ]] && \   if [[ ${PKGTYPE} != virtual ]] && \
2681   [[ ${PKGTYPE} != sources ]]   [[ ${PKGTYPE} != sources ]]
2682   then   then
2683     unpack_package "${magefile}"
2684   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
2685   build_doinstall ${PKGNAME}   build_doinstall ${PKGNAME}
2686   fi   fi
# Line 2732  mage_install() Line 2725  mage_install()
2725   then   then
2726   echo -ne "${COLBLUE} *** ${COLDEFAULT}"   echo -ne "${COLBLUE} *** ${COLDEFAULT}"
2727   echo -n "rebuilding environment ... "   echo -n "rebuilding environment ... "
2728   ${MLIBDIR}/env-rebuild.sh > /dev/null && \   ${MLIBDIR}/env-rebuild > /dev/null && \
2729   echo "done." || echo "failure."   echo "done." || echo "failure."
2730   unset MAGE_ENV_REBUILD   unset MAGE_ENV_REBUILD
2731   fi   fi
# Line 2776  md5sum_packages() Line 2769  md5sum_packages()
2769   pname=$(magename2pname ${magefile})   pname=$(magename2pname ${magefile})
2770   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"   pkgname="$(get_value_from_magefile PKGNAME ${magefile})"
2771   md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"   md5file="${MAGEDIR}/${pcat}/${pname}/md5/${pkgname}.md5"
2772   pkgfile="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"   pkgfile="${pkgname}.${PKGSUFFIX}"
2773   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"   pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
2774    
2775   (( count_current++ ))   (( count_current++ ))
# Line 2786  md5sum_packages() Line 2779  md5sum_packages()
2779   if [[ ${pkgtype} = virtual ]]   if [[ ${pkgtype} = virtual ]]
2780   then   then
2781   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
2782   echo " !md5sum virtual (${count_current}/${count_total}): ${pkgfile/.${PKGSUFFIX}/} ... "   echo " !md5sum virtual (${count_current}/${count_total}): ${pkgname} ... "
2783   continue   continue
2784   fi   fi
2785    
# Line 2794  md5sum_packages() Line 2787  md5sum_packages()
2787   if [[ ${pkgtype} = sources ]]   if [[ ${pkgtype} = sources ]]
2788   then   then
2789   echo -ne " ${COLBLUE}---${COLDEFAULT}"   echo -ne " ${COLBLUE}---${COLDEFAULT}"
2790   echo " !md5sum sources (${count_current}/${count_total}): ${pkgfile/.${PKGSUFFIX}/} ... "   echo " !md5sum sources (${count_current}/${count_total}): ${pkgname} ... "
2791   continue   continue
2792   fi   fi
2793    
# Line 2842  uninstall_packages() Line 2835  uninstall_packages()
2835   pbuild=$(magename2pbuild ${pkg})   pbuild=$(magename2pbuild ${pkg})
2836   can_pcat="${pcat}"   can_pcat="${pcat}"
2837   can_pname="${pname}"   can_pname="${pname}"
2838    
2839   if [ -z "${can_ver_list}" ]   if [ -z "${can_ver_list}" ]
2840   then   then
2841   can_ver_list=" ${pver}-${pbuild}"   can_ver_list=" ${pver}-${pbuild}"
# Line 2997  mage_uninstall() Line 2990  mage_uninstall()
2990   then   then
2991   echo -ne "${COLBLUE} *** ${COLDEFAULT}"   echo -ne "${COLBLUE} *** ${COLDEFAULT}"
2992   echo -n "rebuilding environment ... "   echo -n "rebuilding environment ... "
2993   ${MLIBDIR}/env-rebuild.sh > /dev/null && \   ${MLIBDIR}/env-rebuild > /dev/null && \
2994   echo "done." || echo "failure."   echo "done." || echo "failure."
2995   unset MAGE_ENV_REBUILD   unset MAGE_ENV_REBUILD
2996   fi   fi
# Line 3015  mage_uninstall() Line 3008  mage_uninstall()
3008   unset -f postremove   unset -f postremove
3009  }  }
3010    
3011    # rerun_pkgfunctions [method] pkg1 pkg2 pkg3
3012    rerun_pkgfunctions()
3013    {
3014     local method
3015     local list
3016     local pcat
3017     local pname
3018     local pver
3019     local pbuild
3020     local magefile
3021     local i
3022    
3023     # very basic getops
3024     case $1 in
3025     --method) shift; method="$1" ;;
3026     esac
3027     shift
3028     local list="$@"
3029    
3030     # sanity check
3031     case ${method} in
3032     preinstall|postinstall) ;;
3033     preremove|postremove) ;;
3034     *) die "rerun_pkgfunctions(): Unknown method '${method}'." ;;
3035     esac
3036    
3037     if [[ -n ${MROOT} ]]
3038     then
3039     echo -ne ${COLRED}
3040     echo "!! running in MROOT=${MROOT}"
3041     echo -ne ${COLDEFAULT}
3042     echo
3043     fi
3044    
3045     for pkg in ${list}
3046     do
3047     pcat=$(dep2pcat ${pkg})
3048     pname=$(magename2pname ${pkg})
3049     pver=$(magename2pver ${pkg})
3050     pbuild=$(magename2pbuild ${pkg})
3051     magefile="${MROOT}${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
3052    
3053     if [ -e ${magefile} ]
3054     then
3055     source ${magefile}
3056     if [ -n "$(typeset -f ${method})" ]
3057     then
3058     echo -e " ${COLBLUE}***${COLDEFAULT} running ${method} for ${pkg} ... "
3059     ${method}
3060     else
3061     echo "No ${method}() for pkg '${pkg}' defined. Doing nothing."
3062     fi
3063     unset -f preinstall postinstall preremove postremove
3064     else
3065     die "Magefile '${magefile}' does not exist."
3066     fi
3067     done
3068    }
3069    
3070  show_etc_update_mesg()  show_etc_update_mesg()
3071  {  {
3072   [ ${MAGE_PROTECT_COUNTER} -eq 0 ] && return 0   [ ${MAGE_PROTECT_COUNTER} -eq 0 ] && return 0
# Line 3119  pkgsearch() Line 3171  pkgsearch()
3171   "") continue;;   "") continue;;
3172   esac   esac
3173    
3174   deps="${deps} $(basename ${dep%-*})"   if [[ -z ${deps} ]]
3175     then
3176     deps="$(basename ${dep%-*})"
3177     else
3178     deps="${deps} $(basename ${dep%-*})"
3179     fi
3180   done << EOF   done << EOF
3181  ${depsfull}  ${depsfull}
3182  EOF  EOF
# Line 3130  EOF Line 3187  EOF
3187   "") continue;;   "") continue;;
3188   esac   esac
3189    
3190   sdeps="${sdeps} $(basename ${dep%-*})"   if [[ -z ${sdeps} ]]
3191     then
3192     sdeps="$(basename ${dep%-*})"
3193     else
3194     sdeps="${sdeps} $(basename ${dep%-*})"
3195     fi
3196   done << EOF   done << EOF
3197  ${sdepsfull}  ${sdepsfull}
3198  EOF  EOF
# Line 3144  EOF Line 3206  EOF
3206   then   then
3207   echo "      License:  ${license}"   echo "      License:  ${license}"
3208   fi   fi
3209   echo "      Depends: ${deps}"   echo "      Depends:  ${deps}"
3210   echo "      SDepends: ${sdeps}"   echo "      SDepends: ${sdeps}"
3211   echo   echo
3212    
# Line 3261  EOF Line 3323  EOF
3323  need_busybox_support()  need_busybox_support()
3324  {  {
3325   local cmd   local cmd
3326     local busybox
3327   cmd="$1"   cmd="$1"
3328    
3329   if [[ -x /bin/busybox ]]   for busybox in {,/usr}/bin/busybox
3330   then   do
3331   if [[ $(readlink $(which ${cmd})) = /bin/busybox ]]   if [[ -x ${busybox} ]]
3332   then   then
3333   # needs busybox support   if [[ $(readlink $(type -P ${cmd})) = ${busybox} ]]
3334   return 0   then
3335     # needs busybox support
3336     return 0
3337     fi
3338   fi   fi
3339   fi   done
3340    
3341   # no busybox   # no busybox
3342   return 1   return 1
# Line 3327  known_mage_feature() Line 3393  known_mage_feature()
3393  {  {
3394   local feature="$1"   local feature="$1"
3395   local retval   local retval
3396    
3397   case "${feature}" in   case "${feature}" in
3398   autosvc|!autosvc) retval=0 ;;   autosvc|!autosvc) retval=0 ;;
3399   buildlog|!buildlog) retval=0 ;;   buildlog|!buildlog) retval=0 ;;
# Line 3336  known_mage_feature() Line 3402  known_mage_feature()
3402   compressdoc|!compressdoc) retval=0 ;;   compressdoc|!compressdoc) retval=0 ;;
3403   debug|!debug) retval=0 ;;   debug|!debug) retval=0 ;;
3404   distcc|!distcc) retval=0 ;;   distcc|!distcc) retval=0 ;;
3405     icecc|!icecc) retval=0 ;;
3406   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;   kernelsrcunpack|!kernelsrcunpack) retval=0 ;;
3407   libtool|!libtool) retval=0 ;;   libtool|!libtool) retval=0 ;;
3408   linuxsymlink|!linuxsymlink) retval=0 ;;   linuxsymlink|!linuxsymlink) retval=0 ;;
3409     multilib|!multilib) reval=0 ;;
3410   pkgbuild|!pkgbuild) retval=0 ;;   pkgbuild|!pkgbuild) retval=0 ;;
3411   pkgdistrotag|!pkgdistrotag) retval=0 ;;   pkgdistrotag|!pkgdistrotag) retval=0 ;;
3412     pkgmetadata|!pkgmetadata) retval=0 ;;
3413   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
3414   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
3415   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
# Line 3411  msetfeature() Line 3480  msetfeature()
3480   MAGE_FEATURES_CURRENT=( ${MAGE_FEATURES_CURRENT[*]} "${feature}" )   MAGE_FEATURES_CURRENT=( ${MAGE_FEATURES_CURRENT[*]} "${feature}" )
3481   fi   fi
3482    
3483   export MAGE_FEATURE_CURRENT   export MAGE_FEATURES_CURRENT
3484   done   done
3485  }  }
3486    

Legend:
Removed from v.1781  
changed lines
  Added in v.2753