Magellan Linux

Diff of /trunk/mage/usr/lib/mage/smage2.functions.sh

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

revision 3036 by niro, Fri Mar 20 08:33:42 2015 UTC revision 3037 by niro, Fri Jun 30 12:15:28 2017 UTC
# Line 595  march() Line 595  march()
595   return "${retval}"   return "${retval}"
596  }  }
597    
598  marchsrcfile()  marchvariable()
599  {  {
600   local retval   local retval
601   local var="$1"   local var="$1"
602    
603   [[ -z ${var} ]] && var="SRCFILE"   [[ -n ${var} ]] || die "marchvariable(): missing variable"
604    
605   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
606   then   then
# Line 613  marchsrcfile() Line 613  marchsrcfile()
613   return "${retval}"   return "${retval}"
614  }  }
615    
616    marchsrcfile()
617    {
618     local retval
619     local var="$1"
620    
621     [[ -z ${var} ]] && var="SRCFILE"
622    
623     marchvariable "${var}" || die
624    }
625    
626  marchsrcdir()  marchsrcdir()
627  {  {
628   local retval   local retval
# Line 620  marchsrcdir() Line 630  marchsrcdir()
630    
631   [[ -z ${var} ]] && var="SRCDIR"   [[ -z ${var} ]] && var="SRCDIR"
632    
633   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   marchvariable "${var}" || die
  then  
  eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'  
  retval=0  
  else  
  retval=1  
  fi  
   
  return "${retval}"  
634  }  }
635    
636  marchdepend()  marchdepend()

Legend:
Removed from v.3036  
changed lines
  Added in v.3037