Date: Friday, March 31, 2023 @ 18:44:52
  Author: dvzrv
Revision: 1431463

upgpkg: helix 23.03-2: Rebuild to remove unneeded wrapper script.

Remove the helix wrapper script, as it is no longer required.
Setting HELIX_RUNTIME is no longer required as hx resolves its own location in
/usr/lib/helix/hx and now automatically finds the system-wide/ readonly
/usr/lib/helix/runtime dir (so we are only using a symlink now).
Add all direct dependencies.

Modified:
  helix/trunk/PKGBUILD
Deleted:
  helix/trunk/helix.sh

----------+
 PKGBUILD |   14 +++++++-------
 helix.sh |    3 ---
 2 files changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-31 18:41:27 UTC (rev 1431462)
+++ PKGBUILD    2023-03-31 18:44:52 UTC (rev 1431463)
@@ -4,12 +4,12 @@
 
 pkgname=helix
 pkgver=23.03
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-modern modal text editor"
 arch=('x86_64')
 url="https://helix-editor.com";
 license=('MPL2')
-depends=('bash' 'hicolor-icon-theme')
+depends=('gcc-libs' 'glibc' 'hicolor-icon-theme')
 makedepends=('cargo' 'git')
 optdepends=(
   'bash-language-server: for Bash language support'
@@ -33,14 +33,13 @@
   'zls: for Zig language support'
 )
 install="$pkgname.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/helix-editor/helix/archive/$pkgver.tar.gz";
-        "$pkgname.sh")
-sha256sums=('5f9df93c8d98fd4bd13329c0aaf978e74887a0f6022d699ff6161dcee78e8655'
-            'f782c93bc0f2c7b27ec62fb2ba36e11b3354c3953405f8d2017b039c9eac500a')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/helix-editor/helix/archive/$pkgver.tar.gz";)
+sha256sums=('5f9df93c8d98fd4bd13329c0aaf978e74887a0f6022d699ff6161dcee78e8655')
 options=('!lto')
 
 prepare() {
   cd "$pkgname-$pkgver"
+  # NOTE: we are renaming hx to helix so there is no conflict with hex 
(providing hx)
   sed -i "s|hx|helix|g" contrib/completion/hx.*
   sed -i 's|hx|helix|g' contrib/Helix.desktop
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
@@ -58,8 +57,9 @@
 
 package() {
   cd "$pkgname-$pkgver"
-  install -Dm 755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
   install -Dm 755 "target/release/hx" "$pkgdir/usr/lib/$pkgname/hx"
+  install -vdm 755 "$pkgdir/usr/bin"
+  ln -sv /usr/lib/$pkgname/hx "$pkgdir/usr/bin/$pkgname"
   install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
 
   local runtime_dir="$pkgdir/usr/lib/$pkgname/runtime"

Deleted: helix.sh
===================================================================
--- helix.sh    2023-03-31 18:41:27 UTC (rev 1431462)
+++ helix.sh    2023-03-31 18:44:52 UTC (rev 1431463)
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"

Reply via email to