Changeset View

Standalone View

Context not available.
	usage()	usage()
	{	{
	cat <<EOF	cat <<EOF
	usage: etcupdate [-npBF] [-d workdir] [-r \| -s source \| -t tarball]	usage: etcupdate [-anpBF] [-d workdir] [-r \| -s source \| -t tarball]
	[-A patterns] [-D destdir] [-I patterns] [-L logfile]	[-A patterns] [-D destdir] [-I patterns] [-L logfile]
	[-M options]	[-M options]
	etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M options]	etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M options]
Context not available.
	while true; do	while true; do
	# Only display the resolved command if the file	# Only display the resolved command if the file
	# doesn't contain any conflicts.	# doesn't contain any conflicts.
	echo -n "Select: (p) postpone, (df) diff-full, (e) edit,"	if [ -n "$automated" ] ; then
	if ! has_conflicts $1; then	command=mf
	echo -n " (r) resolved,"	else
		echo -n "Select: (p) postpone, (df) diff-full, (e) edit,"
		if ! has_conflicts $1; then
		echo -n " (r) resolved,"
		fi
		echo
		echo -n " (h) help for more options: "
		read command
	fi	fi
	echo
	echo -n " (h) help for more options: "
	read command
	case $command in	case $command in
	df)	df)
	diff -u ${DESTDIR}$1 ${CONFLICTS}$1	diff -u ${DESTDIR}$1 ${CONFLICTS}$1
Context not available.
	ignore=	ignore=
	nobuild=	nobuild=
	preworld=	preworld=
	while getopts "d:nprs:t:A:BD:FI:L:M:" option; do	automated=
		while getopts "d:anprs:t:A:BD:FI:L:M:" option; do
	case "$option" in	case "$option" in
		a)
		automated=YES
		;;
	d)	d)
	WORKDIR=$OPTARG	WORKDIR=$OPTARG
	;;	;;
Context not available.