From: mhmdanas <mhmdanas@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] runit: remove zsh completions.
Date: Sat, 01 Apr 2023 15:40:24 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43162@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is a new pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages runit-remove-zsh-completions
https://github.com/void-linux/void-packages/pull/43162
runit: remove zsh completions.
Fixes #36593.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43162.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-runit-remove-zsh-completions-43162.patch --]
[-- Type: text/x-diff, Size: 3171 bytes --]
From ac5d7650c4f091e4c083b301c6037d132274b2cf Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 1 Apr 2023 13:57:27 +0100
Subject: [PATCH] runit: remove zsh completions.
Fixes #36593.
---
srcpkgs/runit/files/_sv | 44 -----------------------------------------
srcpkgs/runit/template | 11 +++++------
2 files changed, 5 insertions(+), 50 deletions(-)
delete mode 100644 srcpkgs/runit/files/_sv
diff --git a/srcpkgs/runit/files/_sv b/srcpkgs/runit/files/_sv
deleted file mode 100644
index 465fbfde640c..000000000000
--- a/srcpkgs/runit/files/_sv
+++ /dev/null
@@ -1,44 +0,0 @@
-#compdef sv
-
-# completion for runit sv(1)
-# Leah Neukirchen <leah@vuxu.org>
-# runit 2.1.1, services in /var/service are completed by default
-
-local ret=1 services
-
-_arguments \
- '-v[verbose]' \
- '-w[wait]:seconds' \
- '1: :->cmds' \
- '*:: :->args' && ret=0
-
-case $state in
-cmds)
- _values "sv command" \
- status \
- up \
- down \
- once \
- pause cont hup alarm interrupt quit 1 2 term kill \
- exit
- # above allow one-character shortcuts, complete these
- [[ $words[CURRENT] = [sudopchaiq12tke] ]] ||
- _values "sv command" \
- start \
- stop \
- restart \
- shutdown \
- force-stop \
- force-reload \
- force-restart \
- force-shutdown \
- check
- ret=0;;
-args)
- services=( /var/service/*(-/N:t) )
- (( $#services )) && _values services $services && ret=0
- [[ $words[CURRENT] = */* ]] && _directories && ret=0
- ;;
-esac
-
-return $ret
diff --git a/srcpkgs/runit/template b/srcpkgs/runit/template
index 97c61ccbbaa6..2c7262ecec8d 100644
--- a/srcpkgs/runit/template
+++ b/srcpkgs/runit/template
@@ -1,4 +1,4 @@
-# Template file for 'runit'
+# Template file for 'runits
pkgname=runit
version=2.1.2
revision=14
@@ -8,7 +8,7 @@ short_desc="UNIX init scheme with service supervision"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://smarden.org/runit/"
-distfiles="http://smarden.org/runit/runit-$version.tar.gz"
+distfiles="http://smarden.org/runit/runit-${version}.tar.gz"
checksum=6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18
patch_args=-Np0
@@ -20,14 +20,14 @@ if [ "$build_option_static" ]; then
fi
pre_build() {
- sed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h
+ vsed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h
echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc
echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld
# set default service path to /var/service
- sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c
+ vsed -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' -i sv.c
# change type short to gid_t for getgroups(2) and setgroups(2)
- sed -i -e 's:short x\[4\];$:gid_t x[4];:' chkshsgr.c
+ vsed -e 's:short x\[4\];$:gid_t x[4];:' -i chkshsgr.c
}
do_install() {
@@ -48,6 +48,5 @@ do_install() {
vman $f
done
- vinstall ${FILESDIR}/_sv 644 usr/share/zsh/site-functions
vinstall ${FILESDIR}/sv 644 usr/share/bash-completion/completions
}
next reply other threads:[~2023-04-01 13:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-01 13:40 mhmdanas [this message]
2023-04-01 13:40 ` [PR PATCH] [Updated] " mhmdanas
2023-04-02 12:04 ` leahneukirchen
2023-04-02 18:06 ` [PR PATCH] [Updated] " mhmdanas
2023-04-13 0:30 ` classabbyamp
2023-06-16 12:26 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43162@inbox.vuxu.org \
--to=mhmdanas@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).