backup

Author: jredfox

src/jredfox/common/config/MapConfig.java

@@ -8,7 +8,7 @@
 import java.util.TreeMap;
 
 import jredfox.common.io.IOUtils;
-import jredfox.selfcmd.SelfCommandPrompt;
+import jredfox.common.utils.JavaUtil;
 
 /**
  * a Config that will only support key=value
@@ -114,9 +114,9 @@ public void load()
 
 	public void parseLine(String line) 
 	{
-		String[] reg = SelfCommandPrompt.splitFirst(line, ':', '"', '"');
+		String[] reg = JavaUtil.splitFirst(line, ':', '"', '"');
 		String type = reg[0].trim();
-		reg = SelfCommandPrompt.splitFirst(reg[1], this.sep, '"', '"');
+		reg = JavaUtil.splitFirst(reg[1], this.sep, '"', '"');
 		String key = reg[0].trim();
 		String value = reg[1].trim();
 		Object parsed = this.parseObj(type, value);
@@ -166,7 +166,7 @@ else if(types[5].equals(type))
 		else if(types[6].equals(type))
 			return Boolean.parseBoolean(value);
 		else if(types[7].equals(type))
-			return SelfCommandPrompt.parseQuotes(value, '"', '"');
+			return JavaUtil.parseQuotes(value, '"', '"');
 
 		return null;
 	}

src/jredfox/common/os/OSUtil.java

@@ -5,8 +5,9 @@
 import java.util.List;
 
 import jredfox.common.file.FileUtils;
-import jredfox.selfcmd.SelfCommandPrompt;
-import jredfox.selfcmd.thread.ShutdownThread;
+import jredfox.common.thread.ShutdownThread;
+import jredfox.common.utils.FileUtil;
+import jredfox.common.utils.JavaUtil;
 
 public class OSUtil {
 
@@ -159,9 +160,8 @@ public static boolean isUnsupported()
 	public static File getAppData()
 	{
 		if(isWindows())
-		{
 			return new File(System.getenv("APPDATA"));
-		}
+		
 	    String path = System.getProperty("user.home");
 	    if(isMac())
 	    	path += "/Library/Application Support";
@@ -189,7 +189,7 @@ public static File toWinFile(File file)
 			while(fpath != null)
 			{
 				String fileName = FileUtils.getTrueName(fpath);
-				String filtered = isReserved(fileName) ? ( (fileName.contains(".") ? SelfCommandPrompt.inject(fileName, '.', '_') : fileName + "_") + SelfCommandPrompt.getExtensionFull(fpath)) : (fpath.getParent() != null ? fpath.getName() : fpath.getPath());
+				String filtered = isReserved(fileName) ? ( (fileName.contains(".") ? JavaUtil.inject(fileName, '.', '_') : fileName + "_") + FileUtil.getExtensionFull(fpath)) : (fpath.getParent() != null ? fpath.getName() : fpath.getPath());
 				paths.add(filtered);
 				fpath = fpath.getParentFile();
 			}
@@ -211,7 +211,7 @@ public static File toWinFile(File file)
 	public static File toOSFile(File file)
 	{
 		String invalid = "*/<>?\":|'";//java replaces trailing "\" or "/" and you can't get a file name with "/\" in java so don't check it
-		if(SelfCommandPrompt.containsAny(file.getPath(), invalid))
+		if(JavaUtil.containsAny(file.getPath(), invalid))
 		{
 			file = filter(file, invalid);
 		}

src/jredfox/common/utils/JREUtil.java

@@ -12,6 +12,17 @@
 public class JREUtil {
 
 	public static final String INVALID = "\"'`,";
+	
+	static
+	{	
+		System.setProperty("runnables.jar", getFileFromClass(getMainClass()).getPath());
+		
+		//patch macOs returning junk #untested before Big Sur
+		String dir = System.getProperty("user.dir");
+		String tmp = System.getProperty("java.io.tmpdir");
+		if(dir.contains(tmp) && !dir.startsWith(tmp))
+			JREUtil.syncUserDirWithJar();
+	}
 
 	/**
 	 * Must be called before {@link SelfCommandPrompt#runWithCMD(String, String, Class, String[], boolean, boolean)}
@@ -21,7 +32,7 @@ public static void syncUserDirWithJar()
 	{
 		try 
 		{
-			setUserDir(getFileFromClass(getMainClass()).getParentFile());
+			setUserDir(new File(System.getProperty("runnables.jar")).getParentFile());
 		}
 		catch (Exception e) 
 		{
@@ -39,11 +50,11 @@ public static void setUserDir(File file)
 	}
 
 	/**
-	 * checks if the jar is compiled based on the main class 
+	 *  optimized method for checking if the main executing jar isCompiled
 	 */
 	public static boolean isCompiled()
 	{
-		return isCompiled(getMainClass());
+		return System.getProperty("runnables.jar").endsWith(".jar");
 	}
 
 	/**