Magellan Linux

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

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

revision 1689 by niro, Thu Feb 16 11:58:12 2012 UTC revision 1796 by niro, Wed Apr 11 21:28:27 2012 UTC
# Line 343  munpack() Line 343  munpack()
343   DEST=$2   DEST=$2
344   fi   fi
345    
346     echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
347    
348   [[ ! -d ${DEST} ]] && install -d ${DEST}   [[ ! -d ${DEST} ]] && install -d ${DEST}
349    
350   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
# Line 589  march() Line 591  march()
591  marchsrcfile()  marchsrcfile()
592  {  {
593   local retval   local retval
594   if [[ ! -z $(eval echo \$SRCFILE_${ARCH/i*86/x86}) ]]   local var="$1"
595    
596     [[ -z ${var} ]] && var="SRCFILE"
597    
598     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
599   then   then
600   eval echo \$SRCFILE_${ARCH/i*86/x86} | tr ';' '\n'   eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
601   retval=0   retval=0
602   else   else
603   retval=1   retval=1

Legend:
Removed from v.1689  
changed lines
  Added in v.1796