mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-06-21 22:09:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Shell fixes

Browse Source
This commit is contained in:
crschnick
2023-03-11 01:33:02 +00:00
parent 294c9459a2
commit f2bf943d56
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/io/xpipe/app/update/AppInstaller.java
View File

@@ -43,17 +43,9 @@ public class AppInstaller {
} else {
targetFile = FileNames.join(
s.getTemporaryDirectory(), localFile.getFileName().toString());
try (CommandControl c = s.getShellDialect().getStreamFileWriteCommand(s, targetFile)
.start()) {
c.discardOut();
c.discardErr();
try (InputStream in = Files.newInputStream(localFile)) {
in.transferTo(c.getStdin());
}
c.closeStdin();
try (InputStream in = Files.newInputStream(localFile)) {
in.transferTo(s.getShellDialect().createStreamFileWriteCommand(s, targetFile).startExternalStdin());
}
s.restart();
}
asset.installRemote(s, targetFile);

4
app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java
View File

@@ -60,10 +60,10 @@ public class DesktopShortcuts {
pc.getShellDialect().flatten(pc.getShellDialect().getMkdirsCommand(base + "/Contents/Resources")));
var executable = base + "/Contents/MacOS/" + name;
pc.executeSimpleCommand(pc.getShellDialect().getTextFileWriteCommand(content, executable));
pc.getShellDialect().createTextFileWriteCommand(pc, content, executable).execute();
pc.executeSimpleCommand("chmod ugo+x \"" + executable + "\"");
pc.executeSimpleCommand(pc.getShellDialect().getTextFileWriteCommand("APPL????", base + "/PkgInfo"));
pc.getShellDialect().createTextFileWriteCommand(pc, "APPL????", base + "/PkgInfo").execute();
pc.executeSimpleCommand("cp \"" + icon + "\" \"" + base + "/Contents/Resources/" + name + ".icns\"");
}
}

2
app/src/main/java/io/xpipe/app/util/ScriptHelper.java
View File

@@ -200,7 +200,7 @@ public class ScriptHelper {
.handle();
// processControl.executeSimpleCommand(type.getFileTouchCommand(file), "Failed to create script " + file);
processControl.executeSimpleCommand(type.getTextFileWriteCommand(content, file));
processControl.getShellDialect().createTextFileWriteCommand(processControl, content, file).execute();
processControl.executeSimpleCommand(
type.getMakeExecutableCommand(file), "Failed to make script " + file + " executable");
return file;