Skip to content

Commit 92d6f1a

Browse files
committed
Fix Windows build
1 parent f4bbf08 commit 92d6f1a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jlink {
118118
} else if (os.isWindows()) {
119119
installerOptions.addAll '--win-dir-chooser', '--win-menu', '--win-shortcut'
120120
icon = "${projectDir}/dist/windows/blob.ico"
121-
imageOptions.addAll '--app-content', fileTree("${projectDir}/dist/windows/files").join(',')
121+
imageOptions.addAll '--app-content', file("${projectDir}/dist/windows/files").listFiles().join(',')
122122
} else {
123123
installerOptions.addAll '--linux-shortcut', '--linux-menu-group', 'Utility;Archiving;Java',
124124
'--linux-rpm-license-type', 'GPLv3'

src/main/java/airsquared/blobsaver/app/CLI.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,11 @@ public Void call() throws TSS.TSSException, IOException, InvalidPreferencesForma
165165
exportPath = new File(exportPath, "blobsaver.xml");
166166
}
167167
Prefs.export(exportPath);
168-
System.out.println(success("Successfully exported saved devices."));
168+
if (exportPath.toString().startsWith("/dev")) {
169+
System.err.println(success("Successfully exported saved devices."));
170+
} else {
171+
System.out.println(success("Successfully exported saved devices."));
172+
}
169173
}
170174
return null;
171175
}
@@ -174,7 +178,7 @@ public Void call() throws TSS.TSSException, IOException, InvalidPreferencesForma
174178
void clearAppData() {
175179
System.out.print("Are you sure you would like to permanently clear all blobsaver data? ");
176180
var answer = new Scanner(System.in).nextLine();
177-
if (answer.toLowerCase().matches("y|ye|yes")) {
181+
if (answer.matches("(?i)y|ye|yes")) {
178182
Utils.clearAppData();
179183
System.out.println("The application data has been removed.");
180184
}

0 commit comments

Comments
 (0)