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

Parent Directory | Revision Log | Patch

	revision 1652 by niro, Fri Jan 13 23:16:36 2012 UTC	revision 1658 by niro, Sat Jan 14 00:00:53 2012 UTC
#	Line 72  mchecksum()	Line 72  mchecksum()
72	if [[ -d ${rundir} ]]	if [[ -d ${rundir} ]]
73	then	then
74	pushd ${rundir} &> /dev/null	pushd ${rundir} &> /dev/null
75	${cmd} -c ${file} &> /dev/null	# be verbose here
76		${cmd} -c ${file} #&> /dev/null
77	retval="$?"	retval="$?"
78	popd &> /dev/null	popd &> /dev/null
79	else	else
#	Line 82  mchecksum()	Line 83  mchecksum()
83	return "${retval}"	return "${retval}"
84	}	}
85
86		mcheckemptydir()
87		{
88		local dir="$1"
89		local retval=1
90
91		if [[ ! -d ${dir} ]]
92		then
93		echo "mcheckemptydir(): '${dir}' is not a directory!"
94		retval=3
95		else
96		shopt -s nullglob dotglob
97		files=( ${dir}/* )
98		(( ${#files[*]} )) || retval=0
99		shopt -u nullglob dotglob
100		fi
101
102		return ${retval}
103		}
104
105	unpack_packages()	unpack_packages()
106	{	{
107	local list="$@"	local list="$@"
#	Line 1586  syncmage_tarball()	Line 1606  syncmage_tarball()
1606	then	then
1607	echo -ne "${COLBLUE} --- ${COLDEFAULT}"	echo -ne "${COLBLUE} --- ${COLDEFAULT}"
1608	echo "cleaning old mage-tree ${MAGEDIR}..."	echo "cleaning old mage-tree ${MAGEDIR}..."
1609	rm -rf ${MAGEDIR}	# honor mountpoints and empty dirs
1610		if mountpoint -q ${MAGEDIR}
1611		then
1612		if ! mcheckemptydir ${MAGEDIR}
1613		then
1614		find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xarg --no-run-if-empty rm -r
1615		fi
1616		else
1617		rm -rf ${MAGEDIR}
1618		fi
1619	fi	fi
1620
1621	if need_busybox_support tar	if need_busybox_support tar

---

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

Legend: Removed from v.1652   changed lines   Added in v.1658