ship v1.0.2

Author: technoweenie

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Git LFS Changelog
 
+## 1.0.2 (28 October, 2015)
+
+* Fix issue with 'git lfs smudge' and the batch API. #795 (@technoweenie)
+* Fix race condition in the git scanning code. #801 (@technoweenie)
+
 ## 1.0.1 (23 October, 2015)
 
 * Downcase git config keys (prevents Auth loop) #690 (@WillHipschman)

Nut.toml

@@ -1,7 +1,7 @@
 [application]
 
 name = "git-lfs"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   "Rick Olson <[email protected]>",
   "Scott Barron <[email protected]>",

debian/changelog

@@ -1,3 +1,9 @@
+git-lfs (1.0.2) stable; urgency=low
+
+  * New upstream version
+
+ -- Stephen Gelman <[email protected]>  Wed, 28 Oct 2015 14:29:00 +0000
+
 git-lfs (1.0.1) stable; urgency=low
 
   * New upstream version

lfs/lfs.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	Version            = "1.0.1"
+	Version            = "1.0.2"
 	tempDirPerms       = 0755
 	localMediaDirPerms = 0755
 	localLogDirPerms   = 0755

rpm/SPECS/git-lfs.spec

@@ -1,5 +1,5 @@
 Name:           git-lfs
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Git extension for versioning large files
 

script/build.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -158,22 +159,25 @@ func buildCommand(dir, buildos, buildarch string) error {
 }
 
 func setupInstaller(buildos, buildarch, dir string, buildMatrix map[string]Release) error {
-	files := []string{
+	textfiles := []string{
 		"README.md", "CHANGELOG.md",
 	}
 
-	for _, filename := range files {
+	if buildos == "windows" {
+		return winInstaller(textfiles, buildos, buildarch, dir, buildMatrix)
+	} else {
+		return unixInstaller(textfiles, buildos, buildarch, dir, buildMatrix)
+	}
+}
+
+func unixInstaller(textfiles []string, buildos, buildarch, dir string, buildMatrix map[string]Release) error {
+	for _, filename := range textfiles {
 		cmd := exec.Command("cp", filename, filepath.Join(dir, filename))
 		if err := logAndRun(cmd); err != nil {
 			return err
 		}
 	}
 
-	// Windows installer is uploaded separately. See script/nsis.
-	if buildos == "windows" {
-		return nil
-	}
-
 	fullInstallPath := filepath.Join(dir, "install.sh")
 	cmd := exec.Command("cp", "script/install.sh.example", fullInstallPath)
 	if err := logAndRun(cmd); err != nil {
@@ -193,6 +197,39 @@ func setupInstaller(buildos, buildarch, dir string, buildMatrix map[string]Relea
 	return logAndRun(cmd)
 }
 
+func winInstaller(textfiles []string, buildos, buildarch, dir string, buildMatrix map[string]Release) error {
+	for _, filename := range textfiles {
+		by, err := ioutil.ReadFile(filename)
+		if err != nil {
+			return err
+		}
+
+		winEndings := strings.Replace(string(by), "\n", "\r\n", -1)
+		err = ioutil.WriteFile(filepath.Join(dir, filename), []byte(winEndings), 0644)
+		if err != nil {
+			return err
+		}
+	}
+
+	installerPath := filepath.Dir(filepath.Dir(dir))
+	name := zipName(buildos, buildarch) + ".zip"
+	full := filepath.Join(installerPath, name)
+	matches, err := filepath.Glob(dir + "/*")
+	if err != nil {
+		return err
+	}
+
+	addToMatrix(buildMatrix, buildos, buildarch, name)
+
+	args := make([]string, len(matches)+2)
+	args[0] = "-j" // junk the zip paths
+	args[1] = full
+	copy(args[2:], matches)
+
+	cmd := exec.Command("zip", args...)
+	return logAndRun(cmd)
+}
+
 func addToMatrix(buildMatrix map[string]Release, buildos, buildarch, name string) {
 	buildMatrix[fmt.Sprintf("%s-%s", buildos, buildarch)] = Release{
 		Label:    releaseLabel(buildos, buildarch),

script/nsis/installer.nsi

@@ -3,9 +3,9 @@ OutFile "GitLFSInstaller.exe"
 
 InstallDir $DESKTOP
 
-VIProductVersion "1.0.1.0"
-VIAddVersionKey FileVersion      "1.0.1.0"
-VIAddVersionKey ProductVersion   "1.0.1.0"
+VIProductVersion "1.0.2.0"
+VIAddVersionKey FileVersion      "1.0.2.0"
+VIAddVersionKey ProductVersion   "1.0.2.0"
 VIAddVersionKey ProductName      "Git LFS"
 VIAddVersionKey Comments         "Git LFS"
 VIAddVersionKey CompanyName      "GitHub, Inc"