Skip to content

Commit 6dcc4bc

Browse files
committed
Release 2.9.8: Fix tarball to include all necessary files
- Fixed release tarball generation to include bash completion script, Makefile, source files, and other essential components - Improved tarball generation to use git archive as source of truth, eliminating manual file inventory - Added bash completion information to man page
1 parent 9566df0 commit 6dcc4bc

File tree

5 files changed

+33
-11
lines changed

5 files changed

+33
-11
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ keychain.txt
77
keychain.spec
88
.specstory/
99
.ci-artifacts*/
10-
/keychain-*.tar.gz
10+
dist/

ChangeLog.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# ChangeLog for Keychain - https://github.com/danielrobbins/keychain
22

3+
## keychain 2.9.8 (2 Nov 2025)
4+
5+
This release fixes the release tarball to include all necessary files for building and using keychain.
6+
7+
Bug fixes:
8+
9+
* Fixed release tarball generation to include bash completion script (`completions/keychain.bash`),
10+
Makefile, source files, and other essential components. Previous release (2.9.7) tarball was
11+
missing these files.
12+
* Improved tarball generation to use `git archive` as source of truth, eliminating manual file
13+
inventory and preventing future omissions.
14+
15+
Documentation:
16+
17+
* Added bash completion information to keychain man page (NOTES section).
18+
319
## keychain 2.9.7 (31 Oct 2025)
420

521
This release fixes critical issues with spaces in HOME directories and usernames, and adds official Git Bash on Windows compatibility.

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Y ?= $(shell date +'%Y')
1111
PREFIX ?= /usr/local
1212
COMPLETIONSDIR ?= $(PREFIX)/share/bash-completion/completions
1313

14-
TARBALL_CONTENTS=keychain README.md ChangeLog.md COPYING.txt MAINTAINERS.txt keychain.pod keychain.1 keychain.spec
15-
1614
all: keychain.1 keychain keychain.spec
1715

1816
.PHONY : tmpclean
@@ -61,17 +59,19 @@ keychain: keychain.sh keychain.txt VERSION MAINTAINERS.txt
6159
keychain.txt: keychain.pod
6260
pod2text keychain.pod keychain.txt
6361
64-
keychain-$V.tar.gz: $(TARBALL_CONTENTS)
65-
mkdir keychain-$V
66-
cp $(TARBALL_CONTENTS) keychain-$V
67-
/bin/tar czvf keychain-$V.tar.gz keychain-$V
68-
rm -rf keychain-$V
69-
ls -l keychain-$V.tar.gz
62+
keychain-$V.tar.gz: keychain keychain.1 keychain.spec
63+
mkdir -p dist
64+
rm -rf dist/keychain-$V
65+
git archive --format=tar --prefix=keychain-$V/ HEAD | tar -xf - -C dist/
66+
cp keychain keychain.1 keychain.spec dist/keychain-$V/
67+
tar -C dist -czf dist/keychain-$V.tar.gz keychain-$V
68+
rm -rf dist/keychain-$V
69+
ls -l dist/keychain-$V.tar.gz
7070
7171
# --- Release Automation Helpers ---
7272
.PHONY: release release-refresh
7373
74-
RELEASE_ASSETS=keychain-$V.tar.gz keychain keychain.1
74+
RELEASE_ASSETS=dist/keychain-$V.tar.gz keychain keychain.1
7575
7676
# "release" will orchestrate a tagged release with CI artifact validation & confirmation.
7777
release: $(RELEASE_ASSETS)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.7
1+
2.9.8

keychain.pod

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,5 +737,11 @@ Keychain was created and is currently maintained by Daniel Robbins. To report a
737737
bug or request an enhancement, use the issue tracker at
738738
L<https://github.com/danielrobbins/keychain>.
739739

740+
Keychain includes bash completion support for command-line options, SSH keys,
741+
GPG keys, and extended mode prefixes (C<sshk:>, C<gpgk:>, C<host:>). The
742+
completion script is included in the source tarball at
743+
C<completions/keychain.bash>. For installation instructions, see the README
744+
file or run C<make install-completions>.
745+
740746
The former Funtoo Linux wiki page is preserved only as an historical reference:
741747
L<https://www.funtoo.org/Funtoo:Keychain>.

0 commit comments

Comments
 (0)