src/Tools/jEdit/patches/putenv
author wenzelm
Thu, 25 Oct 2018 22:42:17 +0200
changeset 69188 2fd73a1a0937
child 69191 96b633ac24f8
permissions -rw-r--r--
updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv; proper update of jEdit environment -- avoid warnings in Java 11; activate jdk-11+28;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
69188
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     1
diff -ru 5.5.0/jEdit/org/gjt/sp/jedit/MiscUtilities.java 5.5.0/jEdit-patched/org/gjt/sp/jedit/MiscUtilities.java
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     2
--- 5.5.0/jEdit/org/gjt/sp/jedit/MiscUtilities.java	2018-04-09 01:57:06.000000000 +0200
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     3
+++ 5.5.0/jEdit-patched/org/gjt/sp/jedit/MiscUtilities.java	2018-10-25 22:06:22.258705636 +0200
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     4
@@ -126,6 +126,20 @@
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     5
 	static final Pattern winPattern = Pattern.compile(winPatternString);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     6
 
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     7
 
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     8
+	private static Map<String,String> environ =
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
     9
+		Collections.synchronizedMap(new HashMap(System.getenv()));
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    10
+
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    11
+	public static String getenv(String varName)
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    12
+	{
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    13
+		return environ.get(varName);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    14
+	}
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    15
+
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    16
+	public static void putenv(String varName, String value)
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    17
+	{
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    18
+		environ.put(varName, value);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    19
+	}
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    20
+	
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    21
+
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    22
 	/** A helper function for expandVariables when handling Windows paths on non-windows systems.
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    23
 	*/
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    24
 	private static String win2unix(String winPath)
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    25
@@ -135,7 +149,7 @@
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    26
 		if (m.find())
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    27
 		{
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    28
 			String varName = m.group(2);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    29
-			String expansion = System.getenv(varName);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    30
+			String expansion = getenv(varName);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    31
 			if (expansion != null)
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    32
 				return m.replaceFirst(expansion);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    33
 		}
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    34
@@ -174,7 +188,7 @@
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    35
 				return arg;
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    36
 		}
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    37
 		String varName = m.group(2);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    38
-		String expansion = System.getenv(varName);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    39
+		String expansion = getenv(varName);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    40
 		if (expansion == null) {
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    41
 			if (varName.equalsIgnoreCase("jedit_settings") && jEdit.getSettingsDirectory() != null) {
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    42
 				expansion = jEdit.getSettingsDirectory();
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    43
@@ -184,7 +198,7 @@
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    44
 				varName = varName.toUpperCase();
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    45
 				String uparg = arg.toUpperCase();
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    46
 				m = p.matcher(uparg);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    47
-				expansion = System.getenv(varName);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    48
+				expansion = getenv(varName);
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    49
 			}
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    50
 		}
2fd73a1a0937 updated to jedit_build-20181025 according to patches/macos (Java 11), patches/putenv;
wenzelm
parents:
diff changeset
    51
 		if (expansion != null) {