Merge pull request #54 from anikitenko/staging

Release v1.0.1

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [v1.0.1](#v101)
+Fixes:
+* Fix auto update
+
 ## [v1.0.0](#v100)
 Features:
 * Added API support (see [reference](https://github.com/anikitenko/mini-sftp-client/blob/master/API_REFERENCE.md))

run/.version

@@ -1 +1 @@
-1.0
+1.0.0

run/get_release_info.go

@@ -27,8 +27,6 @@ func getReleaseInfo() (*releaseInfo, error) {
 		return nil, err
 	}
 
-	tagName = strings.TrimPrefix(tagName, "v")
-
 	info := &releaseInfo{TagName: tagName}
 
 	assets := jsonRead.Get("assets").MustArray()

run/main.go

@@ -10,6 +10,8 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	"strings"
+	"path/filepath"
 )
 
 var (
@@ -37,7 +39,12 @@ func main() {
 
 	fmt.Println("Checking for updates...")
 
-	appVersion, err := ioutil.ReadFile(".version")
+	runDir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	appVersion, err := ioutil.ReadFile(runDir+string(filepath.Separator)+".version")
 	if err != nil {
 		logger.Warnf("Unable to get current version: %v", err)
 		StartClient()
@@ -56,7 +63,8 @@ func main() {
 		return
 	}
 
-	cv, err := semver.Make(string(appVersion))
+	cleanAppVersion := strings.TrimSuffix(string(appVersion), "\n")
+	cv, err := semver.Make(cleanAppVersion)
 	if err != nil {
 		logger.Warnf("Problem with parsing current version: %v", err)
 		StartClient()
@@ -91,7 +99,7 @@ func main() {
 
 	newFileName := releaseFound.Name + "-new"
 
-	writer, err := os.Create(newFileName)
+	writer, err := os.Create(runDir+string(filepath.Separator)+newFileName)
 	if err != nil {
 		logger.Warnf("Problem with creating new file: %v", err)
 		StartClient()
@@ -117,20 +125,23 @@ func main() {
 	resp.Body.Close()
 	writer.Close()
 
-	err = os.Remove(releaseFound.Name)
-	if err != nil {
+	if err = os.Remove(runDir+string(filepath.Separator)+releaseFound.Name); err != nil {
 		logger.Warnf("Problem with removing old file version: %v", err)
 		StartClient()
 		return
 	}
 
-	err = os.Rename(newFileName, releaseFound.Name)
-	if err != nil {
+	if err = os.Rename(runDir+string(filepath.Separator)+newFileName, runDir+string(filepath.Separator)+releaseFound.Name); err != nil {
 		logger.Fatalf("Problem with renaming new file: %v", err)
 	}
 
-	err = os.Chmod(releaseFound.Name, 0755)
-	if err != nil {
+	if err = os.Chmod(runDir+string(filepath.Separator)+releaseFound.Name, 0755); err != nil {
 		logger.Fatalf("Problem with setting up execute permissions permissions for new file version: %v", err)
 	}
+
+	if err = ioutil.WriteFile(runDir+string(filepath.Separator)+".version", []byte(latestVersion), 0644); err != nil {
+		logger.Warnf("Problem with updating new version")
+	}
+
+	StartClient()
 }

run/start_client.go

@@ -33,15 +33,15 @@ func StartClient() {
 		logger.Fatalf("Port should be a number: %v", err)
 	}
 
-	if err := os.Setenv("GOPATH", "."); err != nil {
-		logger.Fatalf("Failed to temporary set environment variable: %v", err)
-	}
-
 	runDir, err := filepath.Abs(filepath.Dir(os.Args[0]))
 	if err != nil {
 		logger.Fatal(err)
 	}
 
+	if err := os.Setenv("GOPATH", runDir); err != nil {
+		logger.Fatalf("Failed to temporary set environment variable: %v", err)
+	}
+
 	client := exec.Command(runDir+string(filepath.Separator)+"mini-sftp-client-"+goOS+extension, "-importPath", "github.com/anikitenko/mini-sftp-client", "-runMode", *RunMode, "-port", *PortToListen)
 
 	stdout, err := client.StdoutPipe()