Permalink
Browse files

Added support for vX.X.X and removed option to open prompt after inst…

…all.
  • Loading branch information...
1 parent 7a45443 commit 2c6ed843ebe160af367c2ec97bd8537f1bfb086b @coreybutler committed Jul 2, 2016
Showing with 5 additions and 6 deletions.
  1. +1 −1 build.bat
  2. +0 −1 nvm.iss
  3. +4 −4 src/nvm.go
View
@@ -1,7 +1,7 @@
@echo off
SET INNOSETUP=%CD%\nvm.iss
SET ORIG=%CD%
-SET GOPATH=%CD%\src
+REM SET GOPATH=%CD%\src
SET GOBIN=%CD%\bin
SET GOARCH=386
SET version=1.1.1
View
@@ -306,7 +306,6 @@ end;
[Run]
Filename: "{cmd}"; Parameters: "/C ""mklink /D ""{code:getSymLink}"" ""{code:getCurrentVersion}"""" "; Check: isNodeAlreadyInUse; Flags: runhidden;
-Filename: "{cmd}"; Parameters: "/K ""set PATH={app};%PATH% && cls && nvm"""; Flags: runasoriginaluser postinstall skipifsilent;
[UninstallDelete]
Type: files; Name: "{app}\nvm.exe";
View
@@ -168,9 +168,11 @@ func install(version string, cpuarch string) {
version = reg.ReplaceAllString(re.FindString(content),"")
}
+ version = cleanVersion(version)
+
if CheckVersionExceedsLatest(version) {
- fmt.Println("Node.js v"+version+" is not yet released or available.")
- return
+ fmt.Println("Node.js v"+version+" is not yet released or available.")
+ return
}
if cpuarch == "64" && !web.IsNode64bitAvailable(version) {
@@ -311,8 +313,6 @@ func use(version string, cpuarch string) {
cpuarch = arch.Validate(cpuarch)
- re := regexp.MustCompile("\\d+.\\d+.\\d+")
-
version = cleanVersion(version)
// Make sure the version is installed. If not, warn.

0 comments on commit 2c6ed84

Please sign in to comment.