Skip to content

Commit

Permalink
第一版
Browse files Browse the repository at this point in the history
  • Loading branch information
ystyle committed Nov 8, 2015
1 parent 8880812 commit 3d2b216
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ There are situations where the ability to switch between different versions of J
useful. For example, if you want to test a project you're developing with the latest
bleeding edge version without uninstalling the stable version of JDK, this utility can help.

![Switch between stable and unstable versions.](http://coreybutler.github.io/nvm-windows/images/use.jpg)
![Switch between stable and unstable versions.](dist/images/use.png)

### Installation & Upgrades

It comes with an installer (and uninstaller), because getting it should be easy. Please note, you need to uninstall any existing versions of node.js before installing JVMS for Windows.

[Download the latest installer from the releases](https://github.com/ystyle/jvms/releases).

![JVMS for Windows Installer](http://coreybutler.github.io/nvm-windows/images/installer.jpg)
![JVMS for Windows Installer](dist/images/installer.png)

**To upgrade**, run the new installer. It will safely overwrite the files it needs to update without touching your node.js installations.
Make sure you use the same installation and symlink folder. If you originally installed to the default locations, you just need to click
Expand Down
Binary file modified dist/0.0.1/jvms-noinstall.zip
Binary file not shown.
Binary file modified dist/0.0.1/jvms-setup.zip
Binary file not shown.
Binary file added dist/images/installer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/images/use.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions src/jvms.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"os"
"os/exec"
"regexp"
"strconv"
"strings"

"./jvms/arch"
Expand Down Expand Up @@ -380,7 +379,6 @@ func list(listtype string) {
for i := 0; i < len(v); i++ {
version := v[i]
isnode, _ := regexp.MatchString("v", version)

str := ""
if isnode {
if "v"+inuse == version {
Expand Down Expand Up @@ -514,7 +512,7 @@ func Setup() {
} else if strings.Contains(line, "arch:") {
env.arch = strings.Trim(regexp.MustCompile("arch:").ReplaceAllString(line, ""), " \r\n")
} else if strings.Contains(line, "currentVersion:") {
env.arch = strings.Trim(regexp.MustCompile("currentVersion:").ReplaceAllString(line, ""), " \r\n")
env.currentVersion = strings.Trim(regexp.MustCompile("currentVersion:").ReplaceAllString(line, ""), " \r\n")
} else if strings.Contains(line, "proxy:") {
env.proxy = strings.Trim(regexp.MustCompile("proxy:").ReplaceAllString(line, ""), " \r\n")
if env.proxy != "none" && env.proxy != "" {
Expand Down

0 comments on commit 3d2b216

Please sign in to comment.