[DEPLOY] Deploying v0.8.1

thevpc · Aug 24, 2021 · 4695cae · 4695cae
1 parent 28a2e75
commit 4695cae
Show file tree

Hide file tree

Showing 126 changed files with 622 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,3 +78,7 @@
 /toolbox/ndiff/ndiff.iml
 /toolbox/ndb/ndb.iml
 /toolbox/ncode/ncode.iml
+/lib/nlib-tomcat-classloader/nlib-tomcat-classloader.iml
+/lib/nlib-ssh/nlib-ssh.iml
+/lib/nlib-servlet/nlib-servlet.iml
+/lib/nlib-md/nlib-md.iml
diff --git a/METADATA b/METADATA
@@ -7,4 +7,4 @@ latestJarLocation=http:https://thevpc.net/maven/net/thevpc/nuts/nuts/0.8.1/nuts-0.8.1.
 apiVersion=0.8.1
 implVersion=0.8.1.0
 jarLocation=http:https://thevpc.net/maven/net/thevpc/nuts/nuts/0.8.1/nuts-0.8.1.jar
-buildTime=Sun Aug 22 05:52:17 PM +0000 2021
+buildTime=Tue Aug 24 10:17:22 PM +0000 2021
diff --git a/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/core/app/DefaultCommandLineBash.java b/core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/core/app/DefaultCommandLineBash.java
@@ -146,6 +146,13 @@ public int readEscapedBash(char[] charArray, int i, StringBuilder sb) {
  case '\'':
  case '$':
  case ' ':
+ case '<':
+ case '>':
+ case '(':
+ case ')':
+ case '~':
+ case '&':
+ case '|':
  {
  sb.append(c);
  break;
@@ -175,6 +182,13 @@ public String escapeArgument(String arg, NutsCommandLineFormatStrategy s, NutsSe
  case ' ':
  case '\t':
  case ';':
+ case '<':
+ case '>':
+ case '(':
+ case ')':
+ case '~':
+ case '&':
+ case '|':
  {
  sb.append("\\").append(c);
  break;
@@ -203,6 +217,13 @@ public String escapeArgument(String arg, NutsCommandLineFormatStrategy s, NutsSe
  case '"':
  case '\'':
  case '\\':
+ case '<':
+ case '>':
+ case '(':
+ case ')':
+ case '~':
+ case '&':
+ case '|':
  {
  return escapeArgument(arg,NutsCommandLineFormatStrategy.REQUIRE_QUOTES,session);
  }

diff --git a/...-runtime/src/main/java/net/thevpc/nuts/runtime/core/app/DefaultCommandLineWindowsCmd.java b/...-runtime/src/main/java/net/thevpc/nuts/runtime/core/app/DefaultCommandLineWindowsCmd.java
@@ -197,8 +197,23 @@ public String escapeArgument(String arg, NutsCommandLineFormatStrategy s, NutsSe
  StringBuilder sb=new StringBuilder();
  for (char c : arg.toCharArray()) {
  switch (c){
+ case '\"':
+ case ':':
+ case ';':
+ case '^':
+ case '=':
+ case ',':
  case ' ':
  case '\t':
+ case '<':
+ case '>':
+ case '&':
+ case '(':
+ case ')':
+ case '!':
+ case '\'':
+ case '`':
+ case '~':
  {
  return escapeArgument(arg,NutsCommandLineFormatStrategy.REQUIRE_QUOTES,session);
  }

diff --git a/...ime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNutsWorkspaceListManager.java b/...ime/src/main/java/net/thevpc/nuts/runtime/standalone/DefaultNutsWorkspaceListManager.java
@@ -39,7 +39,7 @@ public DefaultNutsWorkspaceListManager(NutsWorkspace ws, NutsSession session, St
  this.workspaces.put(ws.getUuid(),
  new NutsWorkspaceLocation()
  .setUuid(ws.getUuid())
- .setName("default-workspace")
+ .setName(NutsConstants.Names.DEFAULT_WORKSPACE_NAME)
  .setLocation(this.defaultWorkspace.locations().getWorkspaceLocation())
  );
  this.save(session);

diff --git a/...c/main/java/net/thevpc/nuts/runtime/standalone/config/DefaultNutsWorkspaceEnvManager.java b/...c/main/java/net/thevpc/nuts/runtime/standalone/config/DefaultNutsWorkspaceEnvManager.java
@@ -268,11 +268,28 @@ public NutsActionSupport getDesktopIntegrationSupport(NutsDesktopIntegrationItem
  if (item == null) {
  throw new NutsIllegalArgumentException(getSession(), NutsMessage.cstyle("missing item"));
  }
- String o = getPropertyAsString("desktop-integration-support-for-" + item.name().toLowerCase(), null);
- if (!NutsUtilStrings.isBlank(o)) {
- NutsActionSupport q = NutsActionSupport.parseLenient(o, null, null);
- if (q != null) {
- return q;
+ String optionName = null;
+ switch (item) {
+ case DESKTOP: {
+ optionName = "system-desktop-launcher";
+ break;
+ }
+ case MENU: {
+ optionName = "system-menu-launcher";
+ break;
+ }
+ case SHORTCUT: {
+ optionName = "system-custom-launcher";
+ break;
+ }
+ }
+ if (optionName != null) {
+ String o = getOption(optionName, null);
+ if (!NutsUtilStrings.isBlank(o)) {
+ NutsActionSupport q = NutsActionSupport.parseLenient(o, null, null);
+ if (q != null) {
+ return q;
+ }
  }
  }
  switch (getOsFamily()) {

diff --git a/...a/net/thevpc/nuts/runtime/standalone/wscommands/settings/subcommands/ndi/NameBuilder.java b/...a/net/thevpc/nuts/runtime/standalone/wscommands/settings/subcommands/ndi/NameBuilder.java
@@ -1,5 +1,6 @@
 package net.thevpc.nuts.runtime.standalone.wscommands.settings.subcommands.ndi;
 
+import net.thevpc.nuts.NutsConstants;
 import net.thevpc.nuts.NutsDescriptor;
 import net.thevpc.nuts.NutsId;
 import net.thevpc.nuts.NutsSession;
@@ -172,7 +173,7 @@ private String buildName(String s) {
  }
  case 'h': {
  String str = session.getWorkspace().getHashName().trim();
- if (str.equalsIgnoreCase("default")) {
+ if (str.equalsIgnoreCase(NutsConstants.Names.DEFAULT_WORKSPACE_NAME)) {
  str = "";
  }
  if (wasSep) {

diff --git a/...hevpc/nuts/runtime/standalone/wscommands/settings/subcommands/ndi/base/BaseSystemNdi.java b/...hevpc/nuts/runtime/standalone/wscommands/settings/subcommands/ndi/base/BaseSystemNdi.java
@@ -344,7 +344,7 @@ public PathInfo[] addScript(NdiScriptOptions options, String[] all) {
  Boolean systemWideConfig = options.getLauncher().getSystemWideConfig();
  if (!idsToInstall.isEmpty()) {
  if (systemWideConfig == null) {
- systemWideConfig = workspaceLocation.equals(Paths.get(System.getProperty("user.home")).resolve(".config/nuts/default-workspace"));
+ systemWideConfig = workspaceLocation.equals(Paths.get(System.getProperty("user.home")).resolve(".config/nuts/").resolve(NutsConstants.Names.DEFAULT_WORKSPACE_NAME));
  }
  boolean includeEnv = options.isIncludeEnv();
  for (String id : idsToInstall) {

diff --git a/core/nuts/pom.xml b/core/nuts/pom.xml
@@ -14,7 +14,7 @@
  <maven.compiler.source>1.8</maven.compiler.source>
  <maven.compiler.target>1.8</maven.compiler.target>
  <github.global.server>github</github.global.server>
- <nuts.buildNumber>000080010007</nuts.buildNumber>
+ <nuts.buildNumber>000080010008</nuts.buildNumber>
  <nuts.genericName>Package Manager</nuts.genericName>
  <nuts.categories>/Settings/PackageManager/Nuts</nuts.categories>
 

diff --git a/core/nuts/src/main/java/net/thevpc/nuts/boot/NutsBootWorkspace.java b/core/nuts/src/main/java/net/thevpc/nuts/boot/NutsBootWorkspace.java
@@ -633,7 +633,7 @@ private void ndiUndo() {
  // accessible when deleting others
  String latestDefaultVersion = null;
  try {
- Path nbase = Paths.get(System.getProperty("user.home")).resolve(".local/share/nuts/apps/default-workspace/id/net/thevpc/nuts/nuts");
+ Path nbase = Paths.get(System.getProperty("user.home")).resolve(".local/share/nuts/apps/"+NutsConstants.Names.DEFAULT_WORKSPACE_NAME+"/id/net/thevpc/nuts/nuts");
  if (Files.isDirectory(nbase)) {
  latestDefaultVersion = Files.list(nbase).filter(f -> Files.exists(f.resolve(".nuts-bashrc")))
  .map(x -> sysrcFile.getFileName().toString())

diff --git a/docs/01a85c17.96a91e4f.js b/docs/01a85c17.96a91e4f.js
diff --git a/docs/091f20d6.44067b12.js b/docs/091f20d6.44067b12.js