From 4e37e8ca473ec2131d2c91aa8e6c8dd51b1fd6cd Mon Sep 17 00:00:00 2001 From: crumb <95563276+crumbtoo@users.noreply.github.com> Date: Sat, 18 Feb 2023 17:02:52 -0700 Subject: [PATCH 1/2] fix: replace sed with vgrep (#238) --- CHANGELOG.md | 4 ++++ Taskfile.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 161fde2..ec8db20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 🎀 Changelog +## Unreleased +### Fixed +- Replaced `sed` in-place editing with `grep` and `mv` for compatibility with BSD utils + ## [2.1.0] - 2022-02-10 ### Added - Documented custom userdata types (Job and Timer Objects) diff --git a/Taskfile.yaml b/Taskfile.yaml index 6bf17e0..5c5caae 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -34,4 +34,4 @@ tasks: - rm -vrf "{{.DESTDIR}}{{.BINDIR}}/hilbish" "{{.DESTDIR}}{{.LIBDIR}}" - - sed -i '/hilbish/d' /etc/shells + - grep -v 'hilbish' /etc/shells > /tmp/shells.hilbish_uninstall && mv /tmp/shells.hilbish_uninstall /etc/shells From 013fa30658654923d1061bd3b241d999f6269bb2 Mon Sep 17 00:00:00 2001 From: sammyette Date: Sun, 19 Feb 2023 15:11:55 -0400 Subject: [PATCH 2/2] fix: correct job management commands to call with colon --- nature/commands/bg.lua | 2 +- nature/commands/fg.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nature/commands/bg.lua b/nature/commands/bg.lua index a7f486a..fbb3543 100644 --- a/nature/commands/bg.lua +++ b/nature/commands/bg.lua @@ -7,7 +7,7 @@ commander.register('bg', function(_, sinks) return 1 end - local err = job.background() + local err = job:background() if err then sinks.out:writeln('bg: ' .. err) return 2 diff --git a/nature/commands/fg.lua b/nature/commands/fg.lua index 64b145f..c5b6738 100644 --- a/nature/commands/fg.lua +++ b/nature/commands/fg.lua @@ -7,7 +7,7 @@ commander.register('fg', function(_, sinks) return 1 end - local err = job.foreground() -- waits for job; blocks + local err = job:foreground() -- waits for job; blocks if err then sinks.out:writeln('fg: ' .. err) return 2