beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-22 07:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update script fixes

Browse source
This commit is contained in:
crschnick 2023-03-07 15:49:38 +00:00
parent beb4ccd01f
commit 906676cf58
2 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/src/main/java/io/xpipe/app/update/AppInstaller.java
View file

@ -200,20 +200,19 @@ public class AppInstaller {
@Override
public void installLocal(String file) throws Exception {
var command = String.format(
var command = ShellStore.createLocal().create().subShell(ShellDialects.BASH).command(String.format(
"""
#!/bin/bash
exec || read -rsp "Update failed ..." -n 1 key
function exec {
set -x
echo "+ sudo apt-get remove -qy xpipe"
DEBIAN_FRONTEND=noninteractive sudo apt-get remove -qy xpipe || return 1
echo "+ sudo apt-get install -qy "%s"
DEBIAN_FRONTEND=noninteractive sudo apt-get install -qy "%s" || return 1
xpipe open || return 1
}
exec || read -rsp "Update failed ..."$'\\n' -n 1 key
""",
file);
file, file));
TerminalHelper.open("X-Pipe Updater", command);
}
}
@ -239,11 +238,17 @@ public class AppInstaller {
@Override
public void installLocal(String file) throws Exception {
var command = String.format("""
set -x
sudo rpm -U -v --force "%s"
xpipe open
""", file);
var command = ShellStore.createLocal().create().subShell(ShellDialects.BASH).command(String.format(
"""
function exec {
echo "+ sudo rpm -U -v --force \\"%s\\""
sudo rpm -U -v --force "%s" || return 1
xpipe open || return 1
}
exec || read -rsp "Update failed ..."$'\\n' -n 1 key
""",
file, file));
TerminalHelper.open("X-Pipe Updater", command);
}
}
@ -270,11 +275,17 @@ public class AppInstaller {
@Override
public void installLocal(String file) throws Exception {
var command = String.format("""
set -x
sudo installer -verboseR -allowUntrusted -pkg "%s" -target /
xpipe open
""", file);
var command = ShellStore.createLocal().create().subShell(ShellDialects.BASH).command(String.format(
"""
function exec {
echo "+ sudo installer -verboseR -allowUntrusted -pkg \\"%s\\" -target /"
sudo installer -verboseR -allowUntrusted -pkg "%s" -target / || return 1
xpipe open || return 1
}
exec || read -rsp "Update failed ..."$'\\n' -n 1 key
""",
file, file));
TerminalHelper.open("X-Pipe Updater", command);
}
}

8
app/src/main/java/io/xpipe/app/util/TerminalHelper.java
View file

@ -1,11 +1,17 @@
package io.xpipe.app.util;
import io.xpipe.app.prefs.AppPrefs;
import io.xpipe.core.process.CommandControl;
public class TerminalHelper {
public static void open(String title, CommandControl cc) throws Exception {
var command = cc.prepareTerminalOpen();
open(title, command);
}
public static void open(String title, String command) throws Exception {
if (command.contains("\n")) {
if (command.contains("\n") || !command.strip().equals(command)) {
command = ScriptHelper.createLocalExecScript(command);
}