mirror of
https://github.com/xpipe-io/xpipe.git
synced 2026-08-23 01:36:33 +00:00
Fixes [stage]
This commit is contained in:
@@ -14,7 +14,7 @@ public class AppVersion implements Comparable<AppVersion> {
|
||||
|
||||
public static Optional<AppVersion> parse(String version) {
|
||||
try {
|
||||
var releaseSplit = version.split("-");
|
||||
var releaseSplit = version.strip().split("-");
|
||||
var split = releaseSplit[0].split("\\.");
|
||||
var major = Integer.parseInt(split[0]);
|
||||
var minor = split.length > 1 ? Integer.parseInt(split[1]) : 0;
|
||||
|
||||
@@ -61,7 +61,9 @@ public class SyncCategory extends AppPrefsCategory {
|
||||
ChoiceComp.ofTranslatable(prefs.syncMode, Arrays.asList(SyncMode.values()), false)
|
||||
.maxWidth(getCompWidth()),
|
||||
prefs.syncMode)
|
||||
.disable(prefs.storageGitRemote.isNull().or(prefs.enableGitStorage.not()))
|
||||
.addComp(createManualControls())
|
||||
.disable(prefs.storageGitRemote.isNull().or(prefs.enableGitStorage.not()))
|
||||
.hide(prefs.syncMode.isNotEqualTo(SyncMode.MANUAL).or(prefs.enableGitStorage.not()))
|
||||
.nameAndDescription("browseVault")
|
||||
.addComp(new ButtonComp(AppI18n.observable("browseVaultButton"), () -> {
|
||||
|
||||
@@ -73,6 +73,7 @@ public class DataStorageCompatibilityCheck {
|
||||
.documentationLink(DocumentationLink.MIGRATION)
|
||||
.expected()
|
||||
.handle();
|
||||
AppOperationMode.halt(0);
|
||||
}
|
||||
|
||||
private static void runTransitoryBuild() throws Exception {
|
||||
@@ -82,6 +83,7 @@ public class DataStorageCompatibilityCheck {
|
||||
var shell = LocalShell.get(DataStorageCompatibilityCheck.class);
|
||||
switch (OsType.ofLocal()) {
|
||||
case OsType.Linux ignored -> {
|
||||
Files.createDirectories(tempTarget);
|
||||
shell.command(CommandBuilder.of()
|
||||
.add("tar", "-f")
|
||||
.addFile(downloaded)
|
||||
@@ -97,7 +99,7 @@ public class DataStorageCompatibilityCheck {
|
||||
}
|
||||
case OsType.MacOs ignored -> {
|
||||
AppOperationMode.executeAfterShutdown(() -> {
|
||||
ExternalApplicationHelper.startAsync(CommandBuilder.of().add("open").addFile(tempTarget));
|
||||
ExternalApplicationHelper.startAsync(CommandBuilder.of().add("open").addFile(downloaded));
|
||||
});
|
||||
}
|
||||
case OsType.Windows ignored -> {
|
||||
|
||||
Reference in New Issue
Block a user