Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.functions.sh.in

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

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

    revision 3037 by niro, Fri Mar 20 08:34:04 2015 UTC revision 3038 by niro, Fri Jun 30 12:20:12 2017 UTC
    # Line 550  march() Line 550  march()
    550   return "${retval}"   return "${retval}"
    551  }  }
    552    
    553  marchsrcfile()  marchvariable()
    554  {  {
    555   local retval   local retval
    556   local var="$1"   local var="$1"
    557    
    558   [[ -z ${var} ]] && var="SRCFILE"   [[ -n ${var} ]] || die "marchvariable(): missing variable"
    559    
    560   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    561   then   then
    # Line 568  marchsrcfile() Line 568  marchsrcfile()
    568   return "${retval}"   return "${retval}"
    569  }  }
    570    
    571    marchsrcfile()
    572    {
    573     local retval
    574     local var="$1"
    575    
    576     [[ -z ${var} ]] && var="SRCFILE"
    577    
    578     marchvariable "${var}" || die
    579    }
    580    
    581  marchsrcdir()  marchsrcdir()
    582  {  {
    583   local retval   local retval
    # Line 575  marchsrcdir() Line 585  marchsrcdir()
    585    
    586   [[ -z ${var} ]] && var="SRCDIR"   [[ -z ${var} ]] && var="SRCDIR"
    587    
    588   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}"  
    589  }  }
    590    
    591  marchdepend()  marchdepend()
    Legend:
    Removed from v.3037  
    changed lines
      Added in v.3038