From c75f08806bc58dda8be20348ea404b287f3bc6d4 Mon Sep 17 00:00:00 2001 From: ccccly Date: Sun, 5 Mar 2017 15:46:15 +0800 Subject: [PATCH 1/4] Fix build error.Using relative path in nvm.iss --- nvm.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvm.iss b/nvm.iss index 40d4642b..541d089c 100644 --- a/nvm.iss +++ b/nvm.iss @@ -6,7 +6,7 @@ #define MyAppURL "http://github.com/coreybutler/nvm" #define MyAppExeName "nvm.exe" #define MyIcon "bin\nodejs.ico" -#define ProjectRoot "C:\Users\Corey\Documents\workspace\nvm-windows" +#define ProjectRoot "." [Setup] ; NOTE: The value of AppId uniquely identifies this application. From 8889f643defcda037be4c3702ebd1fd145dfff60 Mon Sep 17 00:00:00 2001 From: ccccly Date: Sun, 5 Mar 2017 16:44:37 +0800 Subject: [PATCH 2/4] Add cleanup when download is interrupted by user. --- src/nvm/web/web.go | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/nvm/web/web.go b/src/nvm/web/web.go index 84df4fc2..f9439ce9 100644 --- a/src/nvm/web/web.go +++ b/src/nvm/web/web.go @@ -5,10 +5,12 @@ import( "net/http" "net/url" "os" + "os/signal" "io" "io/ioutil" + "strings" + "syscall" "crypto/tls" - "strings" "strconv" "../arch" "../file" @@ -50,7 +52,7 @@ func GetFullNpmUrl(path string) string{ return npmBaseAddress + path; } -func Download(url string, target string) bool { +func Download(url string, target string, version string) bool { output, err := os.Create(target) if err != nil { @@ -63,12 +65,28 @@ func Download(url string, target string) bool { fmt.Println("Error while downloading", url, "-", err) } defer response.Body.Close() - + c := make(chan os.Signal, 2) + signal.Notify(c, os.Interrupt, syscall.SIGTERM) + go func() { + <-c + fmt.Println("Download interrupted.Rolling back...") + output.Close() + response.Body.Close() + var err error + if strings.Contains(target, "node") { + err = os.RemoveAll(os.Getenv("NVM_HOME") + "\\v" + version) + } else { + err = os.Remove(target) + } + if err != nil { + fmt.Println("Error while rolling back", err) + } + os.Exit(1) + }() _, err = io.Copy(output, response.Body) if err != nil { fmt.Println("Error while downloading", url, "-", err) } - if response.Status[0:3] != "200" { fmt.Println("Download failed. Rolling Back.") err := os.Remove(target) @@ -111,9 +129,9 @@ func GetNodeJS(root string, v string, a string) bool { } else { fileName := root+"\\v"+v+"\\node"+a+".exe" - fmt.Printf("Downloading node.js version "+v+" ("+a+"-bit)... ") + fmt.Println("Downloading node.js version "+v+" ("+a+"-bit)... ") - if Download(url,fileName) { + if Download(url,fileName,v) { fmt.Printf("Complete\n") return true } else { @@ -142,7 +160,7 @@ func GetNpm(root string, v string) bool { fileName := tempDir+"\\"+"npm-v"+v+".zip" fmt.Printf("Downloading npm version "+v+"... ") - if Download(url,fileName) { + if Download(url,fileName,v) { fmt.Printf("Complete\n") return true } else { From 0467ddd7d74db3e4736b10395d88a86da8d16849 Mon Sep 17 00:00:00 2001 From: ccccly Date: Sun, 5 Mar 2017 16:55:59 +0800 Subject: [PATCH 3/4] Fix nvm node_mirror, npm_mirror doesn't work issue. --- src/nvm.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/nvm.go b/src/nvm.go index cb0a4ccd..5914a369 100644 --- a/src/nvm.go +++ b/src/nvm.go @@ -108,10 +108,22 @@ func main() { saveSettings() } case "update": update() + case "node_mirror": setNodeMirror(detail) + case "npm_mirror": setNpmMirror(detail) default: help() } } +func setNodeMirror(detail string) { + env.node_mirror = detail + saveSettings() +} + +func setNpmMirror(detail string) { + env.npm_mirror = detail + saveSettings() +} + func update() { // cmd := exec.Command("cmd", "/d", "echo", "testing") // var output bytes.Buffer @@ -574,8 +586,8 @@ func updateRootDir(path string) { } func saveSettings() { - content := "root: "+strings.Trim(env.root," \n\r")+"\r\narch: "+strings.Trim(env.arch," \n\r")+"\r\nproxy: "+strings.Trim(env.proxy," \n\r")+"\r\noriginalpath: "+strings.Trim(env.originalpath," \n\r")+"\r\noriginalversion: "+strings.Trim(env.originalversion," \n\r") - content = content + "node_mirror: "+strings.Trim(env.node_mirror," \n\r")+ "npm_mirror: "+strings.Trim(env.npm_mirror," \n\r") + content := "root: " + strings.Trim(env.root, " \n\r") + "\r\narch: " + strings.Trim(env.arch, " \n\r") + "\r\nproxy: " + strings.Trim(env.proxy, " \n\r") + "\r\noriginalpath: " + strings.Trim(env.originalpath, " \n\r") + "\r\noriginalversion: " + strings.Trim(env.originalversion, " \n\r") + content = content + "\r\nnode_mirror: " + strings.Trim(env.node_mirror, " \n\r") + "\r\nnpm_mirror: " + strings.Trim(env.npm_mirror, " \n\r") ioutil.WriteFile(env.settings, []byte(content), 0644) } From 1b663c9fbd80a98b679a3f826ab03d824326283f Mon Sep 17 00:00:00 2001 From: ccccly Date: Sun, 5 Mar 2017 17:04:13 +0800 Subject: [PATCH 4/4] Add nvm node_mirror, npm_mirror usage in Readme. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8893f74b..2e7c6159 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,8 @@ NVM for Windows is a command line tool. Simply type `nvm` in the console for hel - `nvm use [arch]`: Switch to use the specified version. Optionally specify 32/64bit architecture. `nvm use ` will continue using the selected version, but switch to 32/64 bit mode based on the value supplied to ``. - `nvm root `: Set the directory where nvm should store different versions of node.js. If `` is not set, the current root will be displayed. - `nvm version`: Displays the current running version of NVM for Windows. +- `nvm node_mirror `: Set the node mirror.People in China can use *https://npm.taobao.org/mirrors/node/* +- `nvm npm_mirror `: Set the npm mirror.People in China can use *https://npm.taobao.org/mirrors/npm/* ### Gotcha!