From 0544526403cce0d774a7312f64538d6162427a6d Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sat, 6 Jul 2024 14:50:22 -0400 Subject: [PATCH] Update neovim-git to inline create alternatives scripts --- packages/neovim-git/.SRCINFO | 11 ------ packages/neovim-git/ex | 2 -- packages/neovim-git/neovim-git.pacscript | 46 +++++++++++------------- packages/neovim-git/rview | 2 -- packages/neovim-git/rvim | 2 -- packages/neovim-git/view | 2 -- packages/neovim-git/vimdiff | 2 -- 7 files changed, 21 insertions(+), 46 deletions(-) delete mode 100644 packages/neovim-git/ex delete mode 100644 packages/neovim-git/rview delete mode 100644 packages/neovim-git/rvim delete mode 100644 packages/neovim-git/view delete mode 100644 packages/neovim-git/vimdiff diff --git a/packages/neovim-git/.SRCINFO b/packages/neovim-git/.SRCINFO index 3d46242..a76d552 100644 --- a/packages/neovim-git/.SRCINFO +++ b/packages/neovim-git/.SRCINFO @@ -4,11 +4,6 @@ pkgver = 0.10.1 pkgdesc = Vim fork maintained by the community url = https://neovim.io/ source = https://github.com/neovim/neovim.git -source = ex -source = rview -source = rvim -source = view -source = vimdiff makedepends = ninja-build makedepends = gettext makedepends = libtool-bin @@ -34,9 +29,3 @@ replaces = neovim-deb replaces = neovim-bin maintainer = Elsie19 repology = project: neovim -sha256sums = SKIP -sha256sums = 5d3178628afc39f0318638cad19e9ad06ada89926dfb263e93ab35cc8f60e911 -sha256sums = f04c9baa97f49afe7969826b45e283c60e2d52e28aa3ea7fa93a62dab0408a55 -sha256sums = 8528f61eaca19285c8220c7d12099743d76abf872a30515698644c91a05c55e0 -sha256sums = 3cb963a264b6cf45749627408b5a62c6945e5e426b595bb5e6a388194c2c1990 -sha256sums = 1d3123b9d97a4889696ab72db558041b5cca8e26ff51ae557f7842242a7d4ed1 diff --git a/packages/neovim-git/ex b/packages/neovim-git/ex deleted file mode 100644 index 25105ec..0000000 --- a/packages/neovim-git/ex +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/nvim -e "$@" diff --git a/packages/neovim-git/neovim-git.pacscript b/packages/neovim-git/neovim-git.pacscript index c4081a4..9f2e564 100644 --- a/packages/neovim-git/neovim-git.pacscript +++ b/packages/neovim-git/neovim-git.pacscript @@ -2,22 +2,7 @@ pkgname="neovim-git" gives="neovim" pkgver="0.10.1" repology=("project: ${gives}") -source=( - "https://github.com/neovim/neovim.git" - "ex" - "rview" - "rvim" - "view" - "vimdiff" -) -sha256sums=( - "SKIP" - "5d3178628afc39f0318638cad19e9ad06ada89926dfb263e93ab35cc8f60e911" - "f04c9baa97f49afe7969826b45e283c60e2d52e28aa3ea7fa93a62dab0408a55" - "8528f61eaca19285c8220c7d12099743d76abf872a30515698644c91a05c55e0" - "3cb963a264b6cf45749627408b5a62c6945e5e426b595bb5e6a388194c2c1990" - "1d3123b9d97a4889696ab72db558041b5cca8e26ff51ae557f7842242a7d4ed1" -) +source=("https://github.com/neovim/neovim.git") url='https://neovim.io/' pkgdesc="Vim fork maintained by the community" maintainer=("Elsie19 ") @@ -36,16 +21,29 @@ package() { make install DESTDIR="${pkgdir}" install -Dm644 "LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${gives}" install -Dm644 "README.md" -t "${pkgdir}/usr/share/doc/${gives}" - install -Dm755 "${srcdir}/ex" -t "${pkgdir}/usr/libexec/${gives}" - install -Dm755 "${srcdir}/rview" -t "${pkgdir}/usr/libexec/${gives}" - install -Dm755 "${srcdir}/rvim" -t "${pkgdir}/usr/libexec/${gives}" - install -Dm755 "${srcdir}/view" -t "${pkgdir}/usr/libexec/${gives}" - install -Dm755 "${srcdir}/vimdiff" -t "${pkgdir}/usr/libexec/${gives}" + install -Dm755 /dev/stdin -t "${pkgdir}/usr/libexec/${gives}/ex" << 'EOF' +#!/bin/sh +exec /usr/bin/nvim -e "$@" +EOF + install -Dm755 /dev/stdin -t "${pkgdir}/usr/libexec/${gives}/rview" << 'EOF' +#!/bin/sh +exec /usr/bin/nvim -RZ "$@" +EOF + install -Dm755 /dev/stdin -t "${pkgdir}/usr/libexec/${gives}/rvim" << 'EOF' +#!/bin/sh +exec /usr/bin/nvim -Z "$@" +EOF + install -Dm755 /dev/stdin -t "${pkgdir}/usr/libexec/${gives}/view" << 'EOF' +#!/bin/sh +exec /usr/bin/nvim -R "$@" +EOF + install -Dm755 /dev/stdin -t "${pkgdir}/usr/libexec/${gives}/vimdiff" << 'EOF' +#!/bin/sh +exec /usr/bin/nvim -d "$@" +EOF } post_install() { - set -e - update-alternatives --install /usr/bin/editor editor /usr/bin/nvim 30 \ --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ /usr/share/man/man1/nvim.1.gz @@ -59,8 +57,6 @@ post_install() { } pre_remove() { - set -e - case "$1" in remove | deconfigure) update-alternatives --remove editor /usr/bin/nvim diff --git a/packages/neovim-git/rview b/packages/neovim-git/rview deleted file mode 100644 index c142053..0000000 --- a/packages/neovim-git/rview +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/nvim -RZ "$@" diff --git a/packages/neovim-git/rvim b/packages/neovim-git/rvim deleted file mode 100644 index 7407ec4..0000000 --- a/packages/neovim-git/rvim +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/nvim -Z "$@" diff --git a/packages/neovim-git/view b/packages/neovim-git/view deleted file mode 100644 index cfa57a2..0000000 --- a/packages/neovim-git/view +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/nvim -R "$@" diff --git a/packages/neovim-git/vimdiff b/packages/neovim-git/vimdiff deleted file mode 100644 index c494dd3..0000000 --- a/packages/neovim-git/vimdiff +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/nvim -d "$@"