Use realpath(1) to determine the location of the newvers.sh script,
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:
parent
f8a2fe5ead
commit
7c0af95a13
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=254217
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user