1 |
commit: 122cb5a9d81f799f48267535298d7eb011309135 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 5 15:14:35 2014 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 5 15:14:35 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=122cb5a9 |
7 |
|
8 |
mkrelease: clean up bash style |
9 |
|
10 |
--- |
11 |
mkrelease.sh | 65 ++++++++++++++++++++++++++++++++++-------------------------- |
12 |
1 file changed, 37 insertions(+), 28 deletions(-) |
13 |
|
14 |
diff --git a/mkrelease.sh b/mkrelease.sh |
15 |
index a2b5c36..50bdb3c 100755 |
16 |
--- a/mkrelease.sh |
17 |
+++ b/mkrelease.sh |
18 |
@@ -1,4 +1,6 @@ |
19 |
#!/bin/bash |
20 |
+# Copyright 2008-2014 Gentoo Foundation |
21 |
+# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
RELEASE_BUILDDIR=${RELEASE_BUILDDIR:-/var/tmp/portage-release} |
24 |
SOURCE_DIR=${RELEASE_BUILDDIR}/checkout |
25 |
@@ -7,20 +9,24 @@ USE_TAG=false |
26 |
CHANGELOG_REVISION= |
27 |
UPLOAD_LOCATION= |
28 |
|
29 |
-die() { |
30 |
- echo $@ |
31 |
+usage() { |
32 |
echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] <version>" |
33 |
- exit 1 |
34 |
+ exit ${1:-0} |
35 |
} |
36 |
|
37 |
-ARGS=$(getopt -o tu: --long changelog-rev:,tag,upload: \ |
38 |
- -n ${0##*/} -- "$@") |
39 |
+die() { |
40 |
+ printf 'error: %s\n' "$*" |
41 |
+ usage 1 |
42 |
+} |
43 |
+ |
44 |
+ARGS=$(getopt -o htu: --long help,changelog-rev:,tag,upload: \ |
45 |
+ -n "${0##*/}" -- "$@") |
46 |
[ $? != 0 ] && die "initialization error" |
47 |
|
48 |
eval set -- "${ARGS}" |
49 |
|
50 |
while true; do |
51 |
- case "$1" in |
52 |
+ case $1 in |
53 |
--changelog-rev) |
54 |
CHANGELOG_REVISION=$2 |
55 |
shift 2 |
56 |
@@ -30,9 +36,12 @@ while true; do |
57 |
shift |
58 |
;; |
59 |
-u|--upload) |
60 |
- UPLOAD_LOCATION=${2} |
61 |
+ UPLOAD_LOCATION=$2 |
62 |
shift 2 |
63 |
;; |
64 |
+ -h|--help) |
65 |
+ usage |
66 |
+ ;; |
67 |
--) |
68 |
shift |
69 |
break |
70 |
@@ -43,33 +52,33 @@ while true; do |
71 |
esac |
72 |
done |
73 |
|
74 |
-[ -z "$1" ] && die "Need version argument" |
75 |
-[ -n "${1/[0-9]*}" ] && die "Invalid version argument" |
76 |
+[ $# != 1 ] && die "Need version argument" |
77 |
+[[ -n ${1/[0-9]*} ]] && die "Invalid version argument" |
78 |
|
79 |
-VERSION=${1} |
80 |
+VERSION=$1 |
81 |
RELEASE=portage-${VERSION} |
82 |
RELEASE_DIR=${RELEASE_BUILDDIR}/${RELEASE} |
83 |
RELEASE_TARBALL="${RELEASE_BUILDDIR}/${RELEASE}.tar.bz2" |
84 |
-TREE_ISH=$BRANCH |
85 |
-if [[ $USE_TAG = true ]] ; then |
86 |
- TREE_ISH=v$VERSION |
87 |
+TREE_ISH=${BRANCH} |
88 |
+if [[ ${USE_TAG} == "true" ]] ; then |
89 |
+ TREE_ISH="v${VERSION}" |
90 |
fi |
91 |
|
92 |
echo ">>> Cleaning working directories ${RELEASE_DIR} ${SOURCE_DIR}" |
93 |
rm -rf "${RELEASE_DIR}" "${SOURCE_DIR}" || die "directory cleanup failed" |
94 |
mkdir -p "${RELEASE_DIR}" || die "directory creation failed" |
95 |
-mkdir -p "$SOURCE_DIR" || die "mkdir failed" |
96 |
+mkdir -p "${SOURCE_DIR}" || die "mkdir failed" |
97 |
|
98 |
echo ">>> Starting GIT archive" |
99 |
-git archive --format=tar $TREE_ISH | \ |
100 |
- tar -xf - -C "$SOURCE_DIR" || die "git archive failed" |
101 |
+git archive --format=tar ${TREE_ISH} | \ |
102 |
+ tar -xf - -C "${SOURCE_DIR}" || die "git archive failed" |
103 |
|
104 |
echo ">>> Building release tree" |
105 |
cp -a "${SOURCE_DIR}/"{bin,cnf,doc,man,misc,pym} "${RELEASE_DIR}/" || die "directory copy failed" |
106 |
cp "${SOURCE_DIR}/"{DEVELOPING,LICENSE,Makefile,NEWS,README,RELEASE-NOTES,TEST-NOTES} \ |
107 |
"${RELEASE_DIR}/" || die "file copy failed" |
108 |
|
109 |
-rm -rf "$SOURCE_DIR" || die "directory cleanup failed" |
110 |
+rm -rf "${SOURCE_DIR}" || die "directory cleanup failed" |
111 |
|
112 |
echo ">>> Setting portage.VERSION" |
113 |
sed -e "s/^VERSION=.*/VERSION=\"${VERSION}\"/" \ |
114 |
@@ -78,21 +87,21 @@ sed -e "s/^VERSION=.*/VERSION=\"${VERSION}\"/" \ |
115 |
|
116 |
echo ">>> Creating Changelog" |
117 |
git_log_opts="" |
118 |
-if [ -n "$CHANGELOG_REVISION" ] ; then |
119 |
- git_log_opts+=" $CHANGELOG_REVISION^..$TREE_ISH" |
120 |
+if [[ -n ${CHANGELOG_REVISION} ]] ; then |
121 |
+ git_log_opts+=" ${CHANGELOG_REVISION}^..${TREE_ISH}" |
122 |
else |
123 |
- git_log_opts+=" $TREE_ISH" |
124 |
+ git_log_opts+=" ${TREE_ISH}" |
125 |
fi |
126 |
skip_next=false |
127 |
-git log $git_log_opts | fmt -w 80 -p " " | while read -r ; do |
128 |
- if [[ $skip_next = true ]] ; then |
129 |
+git log ${git_log_opts} | fmt -w 80 -p " " | while read -r ; do |
130 |
+ if [[ ${skip_next} == "true" ]] ; then |
131 |
skip_next=false |
132 |
- elif [[ $REPLY = " svn path="* ]] ; then |
133 |
+ elif [[ ${REPLY} == " svn path="* ]] ; then |
134 |
skip_next=true |
135 |
else |
136 |
- echo "$REPLY" |
137 |
+ echo "${REPLY}" |
138 |
fi |
139 |
-done > "$RELEASE_DIR/ChangeLog" || die "ChangeLog creation failed" |
140 |
+done > "${RELEASE_DIR}/ChangeLog" || die "ChangeLog creation failed" |
141 |
|
142 |
cd "${RELEASE_BUILDDIR}" |
143 |
|
144 |
@@ -101,16 +110,16 @@ tar --owner portage --group portage -cjf "${RELEASE_TARBALL}" "${RELEASE}" || \ |
145 |
die "tarball creation failed" |
146 |
|
147 |
DISTDIR=$(portageq distdir) |
148 |
-if [ -n "${DISTDIR}" -a -d "${DISTDIR}" -a -w "${DISTDIR}" ]; then |
149 |
+if [[ -n ${DISTDIR} && -d ${DISTDIR} && -w ${DISTDIR} ]] ; then |
150 |
echo ">>> Copying release tarball into ${DISTDIR}" |
151 |
cp "${RELEASE_TARBALL}" "${DISTDIR}"/ || echo "!!! tarball copy failed" |
152 |
fi |
153 |
|
154 |
-if [ -n "${UPLOAD_LOCATION}" ]; then |
155 |
+if [[ -n ${UPLOAD_LOCATION} ]] ; then |
156 |
echo ">>> Uploading ${RELEASE_TARBALL} to ${UPLOAD_LOCATION}" |
157 |
scp "${RELEASE_TARBALL}" "dev.gentoo.org:${UPLOAD_LOCATION}" || die "upload failed" |
158 |
else |
159 |
- echo "${RELEASE_TARBALL} created" |
160 |
+ du -h "${RELEASE_TARBALL}" |
161 |
fi |
162 |
|
163 |
exit 0 |