Github messages for voidlinux
 help / color / mirror / Atom feed
* [ISSUE] runit: Remove zsh completions
@ 2022-04-09  2:18 foopub
  2022-04-09  2:25 ` foopub
                   ` (7 more replies)
  0 siblings, 8 replies; 11+ messages in thread
From: foopub @ 2022-04-09  2:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 458 bytes --]

New issue by foopub on void-packages repository

https://github.com/void-linux/void-packages/issues/36593

Description:
The file https://github.com/void-linux/void-packages/blob/master/srcpkgs/runit/files/_sv seems unnecessary as better completions are provided by the default https://github.com/zsh-users/zsh/blob/master/Completion/Unix/Command/_runit (which seems to have been created only a few months after in 2014... weird no one has noticed until now)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [PR PATCH] runit: remove zsh completions.
@ 2023-04-01 13:40 mhmdanas
  2023-04-02 12:04 ` leahneukirchen
  2023-04-13  0:30 ` classabbyamp
  0 siblings, 2 replies; 11+ messages in thread
From: mhmdanas @ 2023-04-01 13:40 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-06-16 12:26 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-09  2:18 [ISSUE] runit: Remove zsh completions foopub
2022-04-09  2:25 ` foopub
2022-07-09  2:14 ` github-actions
2022-07-23  2:14 ` [ISSUE] [CLOSED] " github-actions
2022-10-27 21:29 ` RunningDroid
2023-01-18 19:45 ` leahneukirchen
2023-04-19  1:54 ` github-actions
2023-05-04  1:51 ` [ISSUE] [CLOSED] " github-actions
2023-06-16 12:26 ` leahneukirchen
2023-04-01 13:40 [PR PATCH] runit: remove " mhmdanas
2023-04-02 12:04 ` leahneukirchen
2023-04-13  0:30 ` classabbyamp

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).