Skip to content

Update CommandLineTest.testCommandLineVersion() #9695

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

Merged
merged 3 commits into from
Feb 7, 2020
Merged

Update CommandLineTest.testCommandLineVersion() #9695

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb826d
Update CommandLineTest.testCommandLineVersion()
tlk Jan 31, 2020
07a46c8
Revert "Update CommandLineTest.testCommandLineVersion()"
tlk Feb 6, 2020
8c3f214
Print log4j store directory only when operating in GUI mode
tlk Feb 6, 2020
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
9 changes: 6 additions & 3 deletions app/src/processing/app/Base.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,6 @@ public Base(String[] args) throws Exception {
BaseNoGui.getPlatform().init();

BaseNoGui.initPortableFolder();
// This configure the logs root folder
System.out.println("Set log4j store directory " + BaseNoGui.getSettingsFolder().getAbsolutePath());
System.setProperty("log4j.dir", BaseNoGui.getSettingsFolder().getAbsolutePath());

// Look for a possible "--preferences-file" parameter and load preferences
BaseNoGui.initParameters(args);
Expand All @@ -218,6 +215,12 @@ public Base(String[] args) throws Exception {
parser.parseArgumentsPhase1();
commandLine = !parser.isGuiMode();

// This configure the logs root folder
if (parser.isGuiMode()) {
System.out.println("Set log4j store directory " + BaseNoGui.getSettingsFolder().getAbsolutePath());
}
System.setProperty("log4j.dir", BaseNoGui.getSettingsFolder().getAbsolutePath());

BaseNoGui.checkInstallationFolder();

// If no path is set, get the default sketchbook folder for this platform
Expand Down