diff options
author | Ulrik Strid <ulrik.strid@outlook.com> | 2022-01-04 10:04:06 +0100 |
---|---|---|
committer | Ulrik Strid <ulrik.strid@outlook.com> | 2022-01-04 11:20:23 +0100 |
commit | ea368b3c62230e9fdad5e9dbf2d1e04e15b5f15d (patch) | |
tree | 73c29d49f030f5d759cc2e634becb005ac67d6f5 /pkgs/desktops/gnome/extensions/taskwhisperer | |
parent | 05865e69fbdbd11b1174b91250e490d3469ad33a (diff) |
gnomeExtensions.taskwhisperer: 16 -> 20
Diffstat (limited to 'pkgs/desktops/gnome/extensions/taskwhisperer')
-rw-r--r-- | pkgs/desktops/gnome/extensions/taskwhisperer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch | 198 |
2 files changed, 101 insertions, 101 deletions
diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index 19936f6be61db..5f7dc7b06a365 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-taskwhisperer"; - version = "16"; + version = "20"; src = fetchFromGitHub { owner = "cinatic"; repo = "taskwhisperer"; rev = "v${version}"; - sha256 = "05w2dfpr5vrydb7ij4nd2gb7c31nxix3j48rb798r4jzl1rakyah"; + sha256 = "sha256-UVBLFXsbOPRXC4P5laZ82Rs08yXnNnzJ+pp5fbx6Zqc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch index 2ea54f4b0897d..0e3ea668a8a18 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch @@ -1,99 +1,99 @@ -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; +diff --git a/taskwhisperer-extension@infinicode.de/metadata.json b/taskwhisperer-extension@infinicode.de/metadata.json +index 2f1471c..a84bdf4 100644 +--- a/taskwhisperer-extension@infinicode.de/metadata.json ++++ b/taskwhisperer-extension@infinicode.de/metadata.json +@@ -6,7 +6,8 @@ + "3.32", + "3.36", + "3.38", +- "40" ++ "40", ++ "41" + ], + "url": "https://github.com/cinatic/taskwhisperer", + "uuid": "taskwhisperer-extension@infinicode.de", +diff --git a/taskwhisperer-extension@infinicode.de/services/taskService.js b/taskwhisperer-extension@infinicode.de/services/taskService.js +index df09cdf..df68c60 100644 +--- a/taskwhisperer-extension@infinicode.de/services/taskService.js ++++ b/taskwhisperer-extension@infinicode.de/services/taskService.js +@@ -63,7 +63,7 @@ var loadTaskData = async ({ taskStatus, project, taskOrder }) => { + + await syncTasks() + +- const command = ['task', 'rc.json.array=on', statusFilter, projectFilter, 'export'].join(' ') ++ const command = ['@task@', 'rc.json.array=on', statusFilter, projectFilter, 'export'].join(' ') + + let { output, error } = await run({ command }) + +@@ -110,7 +110,7 @@ var loadProjectsData = async taskStatus => { + + await syncTasks() + +- const command = ['task', 'rc.json.array=on', statusFilter, 'export'].join(' ') ++ const command = ['@task@', 'rc.json.array=on', statusFilter, 'export'].join(' ') + const { output: allTheTasks } = await run({ command }) + + let sortedUniqueProjects = [] +@@ -129,7 +129,7 @@ var setTaskDone = async taskID => { + return + } + +- const command = ['task', taskID.toString(), 'done'].join(' ') ++ const command = ['@task@', taskID.toString(), 'done'].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -146,7 +146,7 @@ var setTaskUndone = async taskUUID => { + return + } + +- const command = ['task', `uuid:${taskUUID}`, 'modify', 'status:pending'].join(' ') ++ const command = ['@task@', `uuid:${taskUUID}`, 'modify', 'status:pending'].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -163,7 +163,7 @@ var startTask = async taskID => { + return + } + +- const command = ['task', taskID.toString(), 'start'].join(' ') ++ const command = ['@task@', taskID.toString(), 'start'].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -180,7 +180,7 @@ var stopTask = async taskID => { + return + } + +- const command = ['task', taskID.toString(), 'stop'].join(' ') ++ const command = ['@task@', taskID.toString(), 'stop'].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -195,7 +195,7 @@ var stopTask = async taskID => { + var createTask = async task => { + const params = _convertTaskToParams(task) + +- const command = ['task', 'add', ...params].join(' ') ++ const command = ['@task@', 'add', ...params].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -212,7 +212,7 @@ var modifyTask = async (taskUUID, task) => { + + const params = _convertTaskToParams(task) + +- const command = ['task', `uuid:${taskUUID}`, 'modify', ...params].join(' ') ++ const command = ['@task@', `uuid:${taskUUID}`, 'modify', ...params].join(' ') + const result = await run({ command, asJson: false }) + + if (!result.error) { +@@ -227,7 +227,7 @@ var syncTasks = async () => { + return + } + +- const command = ['task', 'sync'].join(' ') ++ const command = ['@task@', 'sync'].join(' ') + const result = await run({ command, asJson: false }) + + _showProcessErrorNotificationIfError(result, 'Sync Tasks') |