Magellan Linux

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

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

revision 2361 by niro, Mon Jan 6 12:40:29 2014 UTC revision 2362 by niro, Mon Jan 6 12:47:23 2014 UTC
# Line 609  marchsrcfile() Line 609  marchsrcfile()
609  marchsrcdir()  marchsrcdir()
610  {  {
611   local retval   local retval
612   if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]   local var="$1"
613    
614     [[ -z ${var} ]] && var="SRCDIR"
615    
616     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
617   then   then
618   eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'   eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
619   retval=0   retval=0
620   else   else
621   retval=1   retval=1
# Line 623  marchsrcdir() Line 627  marchsrcdir()
627  marchdepend()  marchdepend()
628  {  {
629   local retval   local retval
630     local var="$1"
631    
632     [[ -z ${var} ]] && var="DEPEND"
633    
634   if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
635   then   then
636   echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
637   retval=0   retval=0
638   else   else
639   retval=1   retval=1
# Line 638  marchdepend() Line 645  marchdepend()
645  marchsdepend()  marchsdepend()
646  {  {
647   local retval   local retval
648   if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]   local var="$1"
649    
650     [[ -z ${var} ]] && var="SDEPEND"
651    
652     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
653   then   then
654   echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
655   retval=0   retval=0
656   else   else
657   retval=1   retval=1

Legend:
Removed from v.2361  
changed lines
  Added in v.2362