From owner-svn-src-head@freebsd.org  Wed Oct 18 15:48:27 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A63DFE3CA80;
 Wed, 18 Oct 2017 15:48:27 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 746F183466;
 Wed, 18 Oct 2017 15:48:27 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9IFmQIN010841;
 Wed, 18 Oct 2017 15:48:26 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9IFmQlw010840;
 Wed, 18 Oct 2017 15:48:26 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201710181548.v9IFmQlw010840@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 18 Oct 2017 15:48:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324723 - head/tools/build
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/tools/build
X-SVN-Commit-Revision: 324723
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Oct 2017 15:48:27 -0000

Author: brd (doc,ports committer)
Date: Wed Oct 18 15:48:26 2017
New Revision: 324723
URL: https://svnweb.freebsd.org/changeset/base/324723

Log:
  Teach beinstall to use and prefer svnlite, with a fallback to svn.
  
  Approved by:	will

Modified:
  head/tools/build/beinstall.sh

Modified: head/tools/build/beinstall.sh
==============================================================================
--- head/tools/build/beinstall.sh	Wed Oct 18 15:38:05 2017	(r324722)
+++ head/tools/build/beinstall.sh	Wed Oct 18 15:48:26 2017	(r324723)
@@ -106,7 +106,13 @@ if [ -d .git ] ; then
     [ $? -ne 0 ] && errx "Can't lookup git commit timestamp"
     commit_ts=$(date -r ${commit_time} '+%Y%m%d.%H%M%S')
 elif [ -d .svn ] ; then
-    commit_ts=$( svn info | awk '/Last Changed Date/ {print $4 "." $5}' | tr -d :- )
+    if [ -f /usr/bin/svnlite ]; then
+        commit_ts=$( svnlite info --show-item last-changed-date | sed -e 's/\..*//' -e 's/T/./' -e 's/-//g' -e s'/://g' )
+    elif [ -f /usr/local/bin/svn ]; then
+        commit_ts=$( svn info --show-item last-changed-date | sed -e 's/\..*//' -e 's/T/./' -e 's/-//g' -e s'/://g' )
+    else
+        errx "Can't lookup Subversion commit timestamp"
+    fi
     [ $? -ne 0 ] && errx "Can't lookup Subversion commit timestamp"
 else
     errx "Unable to determine sandbox type"