[tor-commits] [user-manual/master] Use the new git-tb-version script to find Tor Browser version

[lunar at torproject.org]

commit 6e95e27712a1a65c9f97caf8933184d495712579
Author: Lunar <lunar at torproject.org>
Date:   Thu Mar 5 18:26:03 2015 +0100

    Use the new git-tb-version script to find Tor Browser version
---
 configure.ac |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a1b12f7..714740d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,12 +8,12 @@ AC_ARG_WITH(tor-browser-bundle,
             AC_HELP_STRING([--with-tor-browser-bundle=PROGRAM],
                            [location of the clone of tor-browser-bundle.git]),
             [tor_browser_bundle_dir=$withval])
-VERSIONS_PATH="${tor_browser_bundle_dir}/gitian/versions"
-if ! sh -n "$VERSIONS_PATH" 2>/dev/null; then
+GET_TB_VERSION="${tor_browser_bundle_dir}/gitian/get-tb-version"
+if ! test -x "$GET_TB_VERSION"; then
     AC_MSG_ERROR([Please clone tor-browser-bundle.git and specify its location using --with-tor-browser-bundle])
 fi
 
-TOR_BROWSER_VERSION=$(. "$VERSIONS_PATH"; echo "$TORBROWSER_VERSION")
+TOR_BROWSER_VERSION=$(eval $(GIT_DIR=${tor_browser_bundle_dir}/.git $GET_TB_VERSION); echo "$TORBROWSER_VERSION")
 if test "x$TOR_BROWSER_VERSION" = "x"; then
     AC_MSG_ERROR([Couldn't determine Tor Browser version.])
 fi