Date: Fri, 27 Jun 2014 19:12:07 +0400 From: Boris Samorodov <bsam@passap.ru> To: Warner Losh <imp@bsdimp.com> Cc: freebsd-arm@FreeBSD.org Subject: Re: [crochet] Introduce SVN_CMD at lib/subversion.sh Message-ID: <53AD89C7.7010403@passap.ru> In-Reply-To: <A538E7D1-6A70-4B45-AD34-F314D6E75CE3@bsdimp.com> References: <53AD4BBF.9060202@passap.ru> <A538E7D1-6A70-4B45-AD34-F314D6E75CE3@bsdimp.com>
next in thread | previous in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
27.06.2014 18:53, Warner Losh пишет:
>
> On Jun 27, 2014, at 4:47 AM, Boris Samorodov <bsam@passap.ru> wrote:
>
>> Hi Tim, All!
>>
>> Sometimes I use systems which have only svnlite version.
>> I propose a patch to let crochet work at those systems as well:
>
> Where is SVN_CMD set?
Look further at [*]
> Most other things in the system would just call this SVN. Is there a reason we need the _CMD?
No reason. The name was inspired by the port's system (like ECHO_CMD,
etc.). I'm fine with whatever name.
> Warner
>
>> -----
>> --- lib/subversion.sh.orig 2014-03-30 13:28:41.000000000 +0400
>> +++ lib/subversion.sh 2014-06-27 14:37:01.668105743 +0400
>> @@ -1,15 +1,16 @@
>> +: ${SVN_CMD:=`which svn 2>/dev/null || which svnlite 2>/dev/null`}
[*]
>> svn_update_sourcetree ( ) {
>> echo "Updating source tree ${FREEBSD_SRC}"
>> cd ${FREEBSD_SRC}
>> - svn update > ${WORKDIR}/_.svnupdate.log
>> + ${SVN_CMD} update > ${WORKDIR}/_.svnupdate.log
>> cd ${TOPDIR}
>> }
>>
>> svn_get_revision ( ) {
>> _PWD=`pwd`
>> cd ${FREEBSD_SRC}
>> - SOURCE_VERSION=`svn info |grep Revision: |cut -c11-`
>> + SOURCE_VERSION=`${SVN_CMD} info |grep Revision: |cut -c11-`
>> cd $_PWD
>> echo "Source version is: ${SOURCE_VERSION:-unknown}";
>> }
>> -----
- --
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBCgAGBQJTrYnHAAoJEJYOILA6P20oh0YP/3V4QOnGwsJrCgy0/1rWrRiG
bj+B7dd8knDS/XuKmuS2+qFgeXE59tQtUvh1U6SnZsUk/Xttse/JXc3H1iroG/VW
aVcqgjjTgjySVQfBhhPgXGaaimbPGLdA2ScSi4doub52xr3Nx+jC1NQzyyhZ2my0
Ot3lp6UZoPxjzOq/hWXdUxHWX69c5TIm/qqOj64pYa7Uhxys7iCHHKSaDy0O/9HN
VwsBYqjnNXZM+yZJMT6JwV+RFEvK+IElXGT6Qsk5uK3XMyPGkTfCKUbVURGWK9dN
xpH4yeF8BJN1qQ0IDsRyFhEGaUrVBgrfz8afJKppRpQFeGZ1Bw+N1V6dWt6NtbJx
rMSBwMOFI2NCQ2hN35GuER5Xh6dNmrJGbsjU6Ypc6SLhgxkDunKZOPyQJobilV4I
Fn/fH0yqda4gdBv260csd2ly3ogreYEswizKafOsTkphIP3eaZK3znYFmsXmMEU/
aHPVsz+MZEg5mqDrRi4gF20rnqfoJtmr55CgDyhNuL6h4imxBCE+oLDxu9UmHJ0H
JI2uaLhZ1d07cuUiNqk4SyWbMnJWINZcLgrJz1pIDRTeBSIUfV6PSSlQbKQstpEF
dfLBT8WCqyitY3THsYMuQhLibWjA2+OhRSMqcn0RuPqPrIATisrevPtSnzAPFJGf
S4DT2VpBb6lkktTwMa1v
=AU2E
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53AD89C7.7010403>