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

Parent Directory | Revision Log | Patch

	revision 2831 by niro, Wed Aug 13 07:10:41 2014 UTC	revision 2832 by niro, Fri Sep 19 11:19:35 2014 UTC
#	Line 595  marchdepend()	Line 595  marchdepend()
595
596	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
597	then	then
598	echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"	# evaluate with escape strings for the magefile if called by smage
599		# but do not escape if the smagefile was called by depwalker directly
600		if [[ ${SMAGE_DEPEND} = 1 ]]
601		then
602		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
603		else
604		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
605		fi
606	retval=0	retval=0
607	else	else
608	retval=1	retval=1
#	Line 613  marchsdepend()	Line 620  marchsdepend()
620
621	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
622	then	then
623	echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"	# evaluate with escape strings for the magefile if called by smage
624		# but do not escape if the smagefile was called by depwalker directly
625		if [[ ${SMAGE_DEPEND} = 1 ]]
626		then
627		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
628		else
629		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
630		fi
631	retval=0	retval=0
632	else	else
633	retval=1	retval=1

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

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