Use the new git-tb-version script to find Tor Browser version
Lunar

Lunar commited on 2015-03-05 18:26:42
Zeige 1 geänderte Dateien mit 3 Einfügungen und 3 Löschungen.

... ...
@@ -8,12 +8,12 @@ AC_ARG_WITH(tor-browser-bundle,
8 8
             AC_HELP_STRING([--with-tor-browser-bundle=PROGRAM],
9 9
                            [location of the clone of tor-browser-bundle.git]),
10 10
             [tor_browser_bundle_dir=$withval])
11
-VERSIONS_PATH="${tor_browser_bundle_dir}/gitian/versions"
12
-if ! sh -n "$VERSIONS_PATH" 2>/dev/null; then
11
+GET_TB_VERSION="${tor_browser_bundle_dir}/gitian/get-tb-version"
12
+if ! test -x "$GET_TB_VERSION"; then
13 13
     AC_MSG_ERROR([Please clone tor-browser-bundle.git and specify its location using --with-tor-browser-bundle])
14 14
 fi
15 15
 
16
-TOR_BROWSER_VERSION=$(. "$VERSIONS_PATH"; echo "$TORBROWSER_VERSION")
16
+TOR_BROWSER_VERSION=$(eval $(GIT_DIR=${tor_browser_bundle_dir}/.git $GET_TB_VERSION); echo "$TORBROWSER_VERSION")
17 17
 if test "x$TOR_BROWSER_VERSION" = "x"; then
18 18
     AC_MSG_ERROR([Couldn't determine Tor Browser version.])
19 19
 fi
20 20