Merge pull request #716 from alecgrieser/fdb-go-tag-update

Go bindings release tag update

bindings/go/README.md

@@ -6,17 +6,11 @@ fdb-go
 This package requires:
 
 - Go 1.1+ with CGO enabled
-- [Mono](http://www.mono-project.com/) (macOS or Windows) or [Visual Studio](https://www.visualstudio.com/) (Windows)  (build-time only)
-- FoundationDB C API 2.0.x, 3.0.x, or 4.x.y (part of the [FoundationDB clients package](https://apple.github.io/foundationdb/downloads.html#c))
+- [Mono](http://www.mono-project.com/) (macOS or Linux) or [Visual Studio](https://www.visualstudio.com/) (Windows)  (build-time only)
+- FoundationDB C API 2.0.x, 3.0.x, or 4.x.y (part of the [FoundationDB client packages](https://apple.github.io/foundationdb/downloads.html#c))
 
 Use of this package requires the selection of a FoundationDB API version at runtime. This package currently supports FoundationDB API versions 200-600.
 
-To build this package, in the top level of this repository run:
-
-    make fdb_go
-
-This will create binary packages for the appropriate platform within the "build" subdirectory of this folder.
-
 To install this package, you can run the "fdb-go-install.sh" script:
 
     ./fdb-go-install.sh install 
@@ -25,6 +19,13 @@ The "install" command of this script does not depend on the presence of the repo
 your local go path. Running "localinstall" instead of "install" will use the local copy here (with a symlink) instead
 of downloading from the remote repository.
 
+You can also build this package, in the top level of this repository run:
+
+    make fdb_go
+
+This will create binary packages for the appropriate platform within the "build" subdirectory of this folder.
+
+
 Documentation
 -------------
 

bindings/go/fdb-go-install.sh

@@ -210,18 +210,18 @@ else
             if [[ -d "${fdbdir}" ]] ; then
                 echo "Directory ${fdbdir} already exists ; checking out appropriate tag"
                 cmd1=( 'git' '-C' "${fdbdir}" 'fetch' 'origin' )
-                cmd2=( 'git' '-C' "${fdbdir}" 'checkout' "release-${FDBVER}" )
+                cmd2=( 'git' '-C' "${fdbdir}" 'checkout' "${FDBVER}" )
 
                 if ! echo "${cmd1[*]}" || ! "${cmd1[@]}" ; then
                     let status="${status} + 1"
                     echo "Could not pull latest changes from origin"
                 elif ! echo "${cmd2[*]}" ||  ! "${cmd2[@]}" ; then
                     let status="${status} + 1"
-                    echo "Could not checkout tag release-${FDBVER}."
+                    echo "Could not checkout tag ${FDBVER}."
                 fi
             else
                 echo "Downloading foundation repository into ${destdir}:"
-                cmd=( 'git' '-C' "${destdir}" 'clone' '--branch' "release-${FDBVER}" "https://${REMOTE}/${FDBREPO}.git" )
+                cmd=( 'git' '-C' "${destdir}" 'clone' '--branch' "${FDBVER}" "https://${REMOTE}/${FDBREPO}.git" )
 
                 echo "${cmd[*]}"
                 if ! "${cmd[@]}" ; then