More elevation fixes

xpipe-io · Mar 8, 2023 · 90ce2de · 90ce2de
1 parent 872406f
commit 90ce2de
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java
@@ -206,8 +206,18 @@ private static String createExecScript(ShellControl processControl, String file,
         return file;
     }
 
-    @SneakyThrows
-    public static String createAskPassScript(SecretValue pass, ShellControl parent, ShellDialect type) {
+    public static String createAskPassScript(SecretValue pass, ShellControl parent) throws Exception {
+        var scriptType = parent.getShellDialect();
+
+        // Fix for power shell as there are permission issues when executing a powershell askpass script
+        if (parent.getShellDialect().equals(ShellDialects.POWERSHELL)) {
+            scriptType = parent.getOsType().equals(OsType.WINDOWS) ? ShellDialects.CMD : ShellDialects.BASH;
+        }
+
+        return createAskPassScript(pass, parent, scriptType);
+    }
+
+    private static String createAskPassScript(SecretValue pass, ShellControl parent, ShellDialect type) throws Exception {
         var content = type.getScriptEchoCommand(pass.getSecretValue());
         var temp = parent.getTemporaryDirectory();
         var file = FileNames.join(temp, "askpass-" + getScriptId() + "." + type.getScriptFileEnding());