d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use realpath(1) to determine the location of the newvers.sh script,

Browse Source 
since the current working directory might not be what is expected,
causing svn{,lite}version to fail to find ${0} (itself).

Submitted by:	Dan Mack
This commit is contained in:
Glen Barber 2013-08-11 13:57:14 +00:00
parent f8a2fe5ead
commit 7c0af95a13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/newvers.sh
View File

@ -96,7 +96,7 @@ for dir in /usr/bin /usr/local/bin; do
# Run svnversion from ${dir} on this script; if return code
# is not zero, the checkout might not be compatible with the
# svnversion being used.
${dir}/svnversion $(basename ${0}) >/dev/null 2>&1
${dir}/svnversion $(realpath ${0}) >/dev/null 2>&1
if [ $? -eq 0 ]; then
svnversion=${dir}/svnversion
break
@ -105,7 +105,7 @@ for dir in /usr/bin /usr/local/bin; do
done
if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then
/usr/bin/svnliteversion $(basename ${0}) >/dev/null 2>&1
/usr/bin/svnliteversion $(realpath ${0}) >/dev/null 2>&1
if [ $? -eq 0 ]; then
svnversion=/usr/bin/svnliteversion
else