Skip to content

Commit 57fad55

Browse files
committed
Pre-release improvements
Clean up NEWS.md.in, clean up maint/release.in.
1 parent 5feeec3 commit 57fad55

File tree

2 files changed

+27
-15
lines changed

2 files changed

+27
-15
lines changed

NEWS.md.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ rcm (@PACKAGE_VERSION@) unstable; urgency=low
66
* BUGFIX: all symlinks in mkrc input are rejected (Mat M).
77
* BUGFIX: messages for -C being a copy so can't update (Mat M).
88
* BUGFIX: expect at least one existing dotfiles directory (Mat M).
9-
* Feature: Move from ruby to python to handle mustache templating (Mat M).
9+
* BUGFIX: fix program name in rcdn -V (Ivan Tkachenko)
10+
* Feature: mkrc hooks via -k/-K (Patrick Brisbin)
1011
* Feature: All symlinks in input are rejected (Mat M).
11-
* Packaging improvements (Stephen Groat, Martin Frost, Link Dupont).
12+
* Packaging improvements (Stephen Groat, Martin Frost, Link Dupont,
13+
Eric Collins, Mat M, Darcy Parker).
1214

1315
-- Mike Burns <mburns@thoughtbot.com> Fri, 13 Jul 2018 14:12:00 -0500
1416

maint/release.in

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ srcdir='@srcdir@'
99
abs_top_builddir='@abs_top_builddir@'
1010
dist_man_MANS='lsrc.1 mkrc.1 rcdn.1 rcup.1 rcrc.5 rcm.7'
1111

12-
edit_package() {
13-
sed \
14-
-e "s|@PACKAGE[@]|$PACKAGE|g" \
15-
-e "s|@PACKAGE_VERSION[@]|$PACKAGE_VERSION|g" \
16-
-e "s|@DIST_ARCHIVES[@]|$DIST_ARCHIVES|g" \
17-
-e "s|@DIST_SHA[@]|$DIST_SHA|g" \
18-
"$1"
19-
}
20-
2112
# Tarball
2213
release_build_tarball() {
2314
([ -d gh-pages ] || git clone --branch gh-pages . gh-pages) && \
@@ -59,6 +50,19 @@ release_clean_arch() {
5950
rm -rf $DIST_ARCHIVES
6051
}
6152

53+
generate_dist_sha() {
54+
export DIST_SHA=$(openssl sha256 $srcdir/$DIST_ARCHIVES | cut -d' ' -f2)
55+
}
56+
57+
edit_package() {
58+
sed \
59+
-e "s|@PACKAGE[@]|$PACKAGE|g" \
60+
-e "s|@PACKAGE_VERSION[@]|$PACKAGE_VERSION|g" \
61+
-e "s|@DIST_ARCHIVES[@]|$DIST_ARCHIVES|g" \
62+
-e "s|@DIST_SHA[@]|$DIST_SHA|g" \
63+
"$1"
64+
}
65+
6266
# Deb
6367
release_build_deb() {
6468
mkdir deb-build && \
@@ -108,10 +112,6 @@ release_clean_tag() {
108112
:
109113
}
110114

111-
generate_dist_sha() {
112-
export DIST_SHA=$(openssl sha256 $srcdir/$DIST_ARCHIVES | cut -d' ' -f2)
113-
}
114-
115115
# manpages as HTML
116116
release_build_man_html() {
117117
([ -d gh-pages ] || git clone --branch gh-pages . gh-pages) && \
@@ -140,6 +140,16 @@ if [ $# -lt 3 ]; then
140140
exit 64
141141
fi
142142

143+
if ! command -v git >/dev/null; then
144+
echo >&2 "release: missing dependency: git"
145+
exit 1
146+
fi
147+
148+
if ! command -v mandoc >/dev/null; then
149+
echo >&2 "release: missing dependency: git"
150+
exit 1
151+
fi
152+
143153
verb="$1"
144154
noun="$2"
145155
DIST_ARCHIVES="$3"

0 commit comments

Comments
 (0)