Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MacOS custom dir support #164

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

MacOS custom dir support #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e16fce
MacOS custom dir support
Oct 19, 2016
57f2f6a
detecting old directory (MacOS)
Nov 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion launcher-bootstrap/src/main/java/com/skcraft/launcher/Bootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.*;
import java.util.logging.Level;

Expand Down Expand Up @@ -183,7 +186,7 @@ public static void setSwingLookAndFeel() {
} catch (Throwable e) {
}
}

private static File getFileChooseDefaultDir() {
JFileChooser chooser = new JFileChooser();
FileSystemView fsv = chooser.getFileSystemView();
Expand All @@ -194,6 +197,21 @@ private File getUserLauncherDir() {
String osName = System.getProperty("os.name").toLowerCase();
if (osName.contains("win")) {
return new File(getFileChooseDefaultDir(), getProperties().getProperty("homeFolderWindows"));
} else if (osName.contains("mac") && getProperties().getProperty("homeFolderMac") != null) {
// this scope can be replaced with: return new File(getFileChooseDefaultDir(), getProperties().getProperty("homeFolderMac"));
File macHomeFolder = new File(getFileChooseDefaultDir(), getProperties().getProperty("homeFolderMac"));
try {
if (!macHomeFolder.exists()) {
File standartHomeFolder = new File(System.getProperty("user.home"), getProperties().getProperty("homeFolder"));
if (standartHomeFolder.exists()) {
log.info("Found launcher directory at the wrong place... Moving " + standartHomeFolder.getAbsolutePath() + " to " + macHomeFolder.getAbsolutePath() + "...");
Files.move(Paths.get(standartHomeFolder.getPath()), Paths.get(macHomeFolder.getPath()), StandardCopyOption.REPLACE_EXISTING);
}
}
} catch (IOException e) {
log.log(Level.WARNING, "Error occurred while moving the directory. Creating and using new laucher directory (" + macHomeFolder.getAbsolutePath() + ").", e);
}
return macHomeFolder;
} else {
return new File(System.getProperty("user.home"), getProperties().getProperty("homeFolder"));
}
Expand Down
3 changes: 2 additions & 1 deletion launcher-bootstrap/src/main/resources/com/skcraft/launcher/bootstrap.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#

homeFolderWindows=Example Launcher
homeFolderMac=Library/Application Support/ExampleLauncher
homeFolder=.examplelauncher
launcherClass=com.skcraft.launcher.Launcher
latestUrl=http://update.skcraft.com/quark/launcher/latest.json
latestUrl=http://update.skcraft.com/quark/launcher/latest.json