search

zbm-dev / zfsbootmenu

ZFS Bootloader for root-on-ZFS systems with support for snapshots and native full disk encryption
https://zfsbootmenu.org
MIT License
841 stars 65 forks source link

releng/version.sh: fix git-based version detection #589

Closed ahesford closed 8 months ago

ahesford commented 8 months ago
  1. Correct typo: --abbrev-rev -> --abbrev-ref
  2. Limit repository search to the current directory

Fixes: #588.

To reproduce the issue fixed by (2) and confirm the fix, do something like

cd $XBPS_DISTDIR
mkdir test
cd test

curl -L https://github.com/zbm-dev/zfsbootmenu/archive/v2.3.0.tar.gz | tar -zxvf -
( cd zfsbootmenu-2.3.0 && make show-version )
# ZFSBootMenu version: 1.0-439-gc274c0d8016

curl -L https://github.com/zbm-dev/zfsbootmenu/archive/git-er-done.tar.gz | tar -zxvf -
( cd zfsbootmenu-git-er-done && make show-version )
# ZFSBootMenu version: 2.3.0+dev
wboschman commented 8 months ago

tested for git-er-done with makepkg and it builds ok.

NAME="ZFSBootMenu"
PRETTY_NAME="ZFSBootMenu"
ID="zfsbootmenu"
ID_LIKE="void"
HOME_URL="https://zfsbootmenu.org"
DOCUMENTATION_URL="https://docs.zfsbootmenu.org"
BUG_REPORT_URL="https://github.com/zbm-dev/zfsbootmenu/issues"
SUPPORT_URL="https://github.com/zbm-dev/zfsbootmenu/discussions"
VERSION="2.3.0+dev"
ahesford commented 8 months ago

Thanks for testing!