Commit 92d6f1a

committed

Fix Windows build

1 parent f4bbf08 commit 92d6f1aCopy full SHA for 92d6f1a

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ jlink {`
`118`	`118`	`} else if (os.isWindows()) {`
`119`	`119`	`installerOptions.addAll '--win-dir-chooser', '--win-menu', '--win-shortcut'`
`120`	`120`	`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(',')`
`122`	`122`	`} else {`
`123`	`123`	`installerOptions.addAll '--linux-shortcut', '--linux-menu-group', 'Utility;Archiving;Java',`
`124`	`124`	`'--linux-rpm-license-type', 'GPLv3'`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,11 @@ public Void call() throws TSS.TSSException, IOException, InvalidPreferencesForma`
`165`	`165`	`exportPath = new File(exportPath, "blobsaver.xml");`
`166`	`166`	`}`
`167`	`167`	`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`	`+ }`
`169`	`173`	`}`
`170`	`174`	`return null;`
`171`	`175`	`}`
`@@ -174,7 +178,7 @@ public Void call() throws TSS.TSSException, IOException, InvalidPreferencesForma`
`174`	`178`	`void clearAppData() {`
`175`	`179`	`System.out.print("Are you sure you would like to permanently clear all blobsaver data? ");`
`176`	`180`	`var answer = new Scanner(System.in).nextLine();`
`177`		`- if (answer.toLowerCase().matches("y\|ye\|yes")) {`
	`181`	`+ if (answer.matches("(?i)y\|ye\|yes")) {`
`178`	`182`	`Utils.clearAppData();`
`179`	`183`	`System.out.println("The application data has been removed.");`
`180`	`184`	`}`

Comments

(0)