100 lines
5.5 KiB
Diff
100 lines
5.5 KiB
Diff
diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh
|
|
index a69e369..35d5ea1 100755
|
|
--- a/taskwhisperer-extension@infinicode.de/extra/create.sh
|
|
+++ b/taskwhisperer-extension@infinicode.de/extra/create.sh
|
|
@@ -1 +1 @@
|
|
-bash -c "task add $1"
|
|
+bash -c "@task@ add $1"
|
|
diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh
|
|
index 7964a26..8edd21b 100755
|
|
--- a/taskwhisperer-extension@infinicode.de/extra/modify.sh
|
|
+++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh
|
|
@@ -1 +1 @@
|
|
-bash -c "task $1 modify $2"
|
|
+bash -c "@task@ $1 modify $2"
|
|
diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js
|
|
index ead7a12..aa36db4 100644
|
|
--- a/taskwhisperer-extension@infinicode.de/taskService.js
|
|
+++ b/taskwhisperer-extension@infinicode.de/taskService.js
|
|
@@ -182,7 +182,7 @@ const TaskService = class TaskService {
|
|
|
|
let project = projectName ? "project:" + projectName : "";
|
|
|
|
- let command = ['task', 'rc.json.array=on', status, project, 'export'];
|
|
+ let command = ['@task@', 'rc.json.array=on', status, project, 'export'];
|
|
let reader = new SpawnReader.SpawnReader();
|
|
|
|
let buffer = "";
|
|
@@ -220,7 +220,7 @@ const TaskService = class TaskService {
|
|
break;
|
|
}
|
|
|
|
- let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
+ let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
|
|
shellProc.wait_async(null, function (obj, result) {
|
|
let shellProcExited = true;
|
|
@@ -261,7 +261,7 @@ const TaskService = class TaskService {
|
|
return;
|
|
}
|
|
|
|
- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
|
|
shellProc.wait_async(null, function (obj, result) {
|
|
let shellProcExited = true;
|
|
@@ -290,7 +290,7 @@ const TaskService = class TaskService {
|
|
return;
|
|
}
|
|
|
|
- let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
+ let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
|
|
shellProc.wait_async(null, function (obj, result) {
|
|
let shellProcExited = true;
|
|
@@ -318,7 +318,7 @@ const TaskService = class TaskService {
|
|
if (!taskID) {
|
|
return;
|
|
}
|
|
- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
shellProc.wait_async(null, function (obj, result) {
|
|
let shellProcExited = true;
|
|
shellProc.wait_finish(result);
|
|
@@ -344,7 +344,7 @@ const TaskService = class TaskService {
|
|
if (!taskID) {
|
|
return;
|
|
}
|
|
- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
shellProc.wait_async(null, function (obj, result) {
|
|
let shellProcExited = true;
|
|
shellProc.wait_finish(result);
|
|
@@ -374,7 +374,7 @@ const TaskService = class TaskService {
|
|
// FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the
|
|
// input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de)
|
|
// bypassing problem with own shell script
|
|
- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
|
|
+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
|
|
|
|
shellProc.wait_async(null, function (obj, result) {
|
|
let shellProcExited = true;
|
|
@@ -403,7 +403,7 @@ const TaskService = class TaskService {
|
|
// FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the
|
|
// input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de)
|
|
// bypassing problem with own shell script
|
|
- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
|
|
+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
|
|
|
|
shellProc.wait_async(null, function (obj, result) {
|
|
let shellProcExited = true;
|
|
@@ -432,7 +432,7 @@ const TaskService = class TaskService {
|
|
let shellProc;
|
|
|
|
try {
|
|
- shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
+ shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE);
|
|
} catch (err) {
|
|
onError(err);
|
|
return;
|