diff --git a/README.md b/README.md index 034914b..7fa3c22 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,11 @@ Installation - Enter in your server URL, your username, and your password. - Then click on the **Aq** icon. You may need to click the Download button next to where it says "PACKAGE EXPLORER: AQUARIUM" to refresh the extension. +Upgrading +=== + +As of this writing, to upgrade to a new version of Nemo, you need to uninstall the old version. To do so, first uninstall it vai VS Code, then remove the installation directory. On a Mac, this directory would be at ~/.vscode/extensions/klavins-lab.nemo-* + Usage === @@ -67,3 +72,8 @@ To start VS Code in development mode: function code () { VSCODE_CWD="$PWD" open -n -b "com.microsoft.VSCode" --args $*; } code . ``` + +To build the package: +```bash +vsce package +``` diff --git a/aquarium.js b/aquarium.js index c2521f7..fb2bddb 100644 --- a/aquarium.js +++ b/aquarium.js @@ -6973,7 +6973,7 @@ AQ.login = function(username, password) { resolve(body); } else { console.log("AQ: COULD NOT LOG IN"); - reject("Could not log in to Aquarium server. Check Nemo's settings.") + reject("Could not log in to Aquarium server at " + AQ.config.aquarium_url + ". Check Nemo's settings.") } }) }) diff --git a/extension.js b/extension.js index 8b26179..30915c4 100644 --- a/extension.js +++ b/extension.js @@ -8,6 +8,8 @@ function activate(context) { let config = vscode.workspace.getConfiguration('nemo'); + AQ.config.aquarium_url = config.localAquariumServerUrl; + function connect() { let operations_types = []; let libraries = []; diff --git a/nemo-0.0.1.vsix b/nemo-0.0.2.vsix similarity index 96% rename from nemo-0.0.1.vsix rename to nemo-0.0.2.vsix index a608bde..bae200c 100644 Binary files a/nemo-0.0.1.vsix and b/nemo-0.0.2.vsix differ diff --git a/package.json b/package.json index f7fe55d..36bc82d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "displayName": "Nemo", "description": "Pull, edit, test, and push Aquarium protocols.", "repository": "https://github.com/klavinslab/nemo", - "version": "0.0.1", + "version": "0.0.2", "engines": { "vscode": "^1.30.0" },