Arch Linux User Repository

Hi again! Quick patch to add an install step for the man page; I also went ahead and plugged in the git describe call to make use of the version tags in the upstream repos, so pkgvers now generate as e.g. 0.10.0.r145.g534c18b, but feel free to ignore that if you intentionally omitted it (it looks like the commented-out version was dropped when the src url switched to sr.ht).

From ccc3f298cbc251fc29448dc8081579cf3840a68c Mon Sep 17 00:00:00 2001
From: Jesse Wertheim <jaawerth@gmail.com>
Date: Tue, 2 Nov 2021 22:20:26 -0400
Subject: [PATCH] Install manpage, update pkgver() w/ git describe

* Add step to install fennel.1 to /usr/share/man/man1
* Update pkgver() fn to use the `git describe`, since tagged releases
  exist in the upstream repos
---
 .SRCINFO | 3 +--
 PKGBUILD | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index eea5e6f..a8d8b17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fennel-git
    pkgdesc = A Lua Lisp language
-   pkgver = r1047.beafb1e
+   pkgver = 0.10.0.r145.g534c18b
    pkgrel = 1
    url = https://github.com/bakpakin/Fennel
    arch = x86_64
@@ -14,4 +14,3 @@ pkgbase = fennel-git
    md5sums = SKIP

 pkgname = fennel-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 17c4afb..508814d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _lua_version=5.4

 pkgname=fennel-git
-pkgver=r1047.beafb1e
+pkgver=0.10.0.r145.g534c18b
 pkgrel=1
 pkgdesc="A Lua Lisp language"
 arch=('x86_64')
@@ -24,7 +24,7 @@ md5sums=('SKIP')

 pkgver() {
    cd "${srcdir}/fennel"
-   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+   git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }

 build() {
@@ -39,4 +39,8 @@ package() {
        -t "${pkgdir}/usr/lib/lua/${_lua_version}"
    install -Dm755 "fennel" \
        "${pkgdir}/usr/bin/fennel"
+   install -Dm644 "fennel.1" \
+       -t "${pkgdir}/usr/share/man/man1"
+   # There will likely be more manpages to add in an upcoming release once
+   # reference.md, api.md, etc are compiled to manpage format during build
 }
-- 
2.33.1

@jaawerth patched! Thanks for the tip :)

Hi!

I threw together a patch to account for the changes to the build process in the repo and the 5.4 discrepancy. These edits allowed me to install fennel-git again without any issues so I figured it might save you some busywork.

I also remember in earlier versions of the PKGBUILD, you had a comment about switching to git describe for pkgver once we had tagged releases in Fennel. We do have that now, so if you wanted to you could update that function to use printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')", which currently output s 0.5.0.r4.a39c4d0.

Here's the patch:

From e4db0e06e5a3413a65f7596b3d077aabf8d4b816 Mon Sep 17 00:00:00 2001
From: Jesse Wertheim <jaawerth@gmail.com>
Date: Mon, 17 Aug 2020 17:57:20 -0400
Subject: [PATCH] Remove reference to fennelfriend.lua

As of 0.5.0, fennel is fully self-hosted and fennelfriend.fnl was moved
to src/fennel/friend.fnl, which is sourced and embedded into fennel.lua
when building.

Arch also now points the `lua` package to lua 5.4, so also updated the
`_lua_version` env var so fennel.lua ends up in the appropriate
directory (though fennel.lua and fennelview.lua should work with all of
5.1-5.4.
---
 PKGBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 05399bc..94febcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Katie Wolfe <katie@dnaf.moe>

-_lua_version=5.3
+_lua_version=5.4

 pkgname=fennel-git
-pkgver=r855.2019aa0
+pkgver=r1027.a39c4d0
 pkgrel=1
 pkgdesc="A Lua Lisp language"
 arch=('x86_64')
@@ -29,13 +29,13 @@ pkgver() {

 build() {
    cd "$srcdir/${pkgname%-git}"
-   make fennel fennel.lua fennelview.lua fennelfriend.lua
+   make fennel fennel.lua fennelview.lua
 }

 package() {
    cd "$srcdir/${pkgname%-git}"

-   install -Dm644 "fennel.lua" "fennelview.lua" "fennelfriend.lua" \
+   install -Dm644 "fennel.lua" "fennelview.lua" \
        -t "${pkgdir}/usr/lib/lua/${_lua_version}"
    install -Dm755 "fennel" \
        "${pkgdir}/usr/bin/fennel"
-- 
2.28.0