View | Details | Raw Unified | Return to bug 189180
Collapse All | Expand All

(-)newvers.sh (-3 / +2 lines)
Lines 110-121 Link Here
110
if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then
110
if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then
111
	/usr/bin/svnliteversion $(realpath ${0}) >/dev/null 2>&1
111
	/usr/bin/svnliteversion $(realpath ${0}) >/dev/null 2>&1
112
	if [ $? -eq 0 ]; then
112
	if [ $? -eq 0 ]; then
113
		svnversion=/usr/bin/svnliteversion
113
		svnversion="/usr/bin/svnliteversion -c"
114
	else
114
	else
115
		svnversion=
115
		svnversion=
116
	fi
116
	fi
117
fi
117
fi
118
119
for dir in /usr/bin /usr/local/bin; do
118
for dir in /usr/bin /usr/local/bin; do
120
	if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
119
	if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
121
		p4_cmd=${dir}/p4
120
		p4_cmd=${dir}/p4
Lines 133-139 Link Here
133
if [ -n "$svnversion" ] ; then
132
if [ -n "$svnversion" ] ; then
134
	svn=`cd ${SYSDIR} && $svnversion 2>/dev/null`
133
	svn=`cd ${SYSDIR} && $svnversion 2>/dev/null`
135
	case "$svn" in
134
	case "$svn" in
136
	[0-9]*)	svn=" r${svn}" ;;
135
	[0-9]*) svn=" r${svn#*:}" ;;
137
	*)	unset svn ;;
136
	*)	unset svn ;;
138
	esac
137
	esac
139
fi
138
fi

Return to bug 189180