Magellan Linux

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

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

revision 2365 by niro, Mon Jan 6 12:56:50 2014 UTC revision 2831 by niro, Fri Sep 19 11:18:38 2014 UTC
# Line 225  download_sources() Line 225  download_sources()
225  }  }
226    
227  # dummy function, used if that does not exist in smage file  # dummy function, used if that does not exist in smage file
228    pkg_setup()
229    {
230     echo "no pkg_setup defined; doing nothing ..."
231     return 0
232    }
233    
234    # dummy function, used if that does not exist in smage file
235  src_prepare()  src_prepare()
236  {  {
237   echo "no src_prepare defined; doing nothing ..."   echo "no src_prepare defined; doing nothing ..."
# Line 633  marchdepend() Line 640  marchdepend()
640    
641   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
642   then   then
643   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"   # evaluate with escape strings for the magefile if called by smage
644     # but do not escape if the smagefile was called by depwalker directly
645     if [[ ${SMAGE_DEPEND} = 1 ]]
646     then
647     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
648     else
649     echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
650     fi
651   retval=0   retval=0
652   else   else
653   retval=1   retval=1
# Line 651  marchsdepend() Line 665  marchsdepend()
665    
666   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
667   then   then
668   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"   # evaluate with escape strings for the magefile if called by smage
669     # but do not escape if the smagefile was called by depwalker directly
670     if [[ ${SMAGE_DEPEND} = 1 ]]
671     then
672     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
673     else
674     echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
675     fi
676   retval=0   retval=0
677   else   else
678   retval=1   retval=1

Legend:
Removed from v.2365  
changed lines
  Added in v.2831