Skip to content

Commit

Permalink
(release) Fix making releases
Browse files Browse the repository at this point in the history
  • Loading branch information
GochoMugo committed Jan 24, 2016
1 parent c494125 commit 38ce383
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 10 deletions.
21 changes: 16 additions & 5 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ echo "${MANPATH}" | grep "${MSU_MAN}" > /dev/null || {
}


# there are cases where manpages are not generated yet
if [ -f docs/man/man1/msu.1 ] && [ -f docs/man/man3/msu.3 ]
then
echo "${MARKER} copying manpages"
Expand All @@ -75,15 +76,25 @@ then
fi


echo "${MARKER} generating metadata"
MSU_BUILD_HASH=$(git rev-parse HEAD)
MSU_BUILD_DATE=$(git show -s --format=%ci "${MSU_BUILD_HASH}")
# tarballs do NOT ship with the .git directory
# instead, the metadata is generated at release time
if [ -d .git ]
then
echo "${MARKER} generating metadata"
MSU_BUILD_HASH=$(git rev-parse HEAD)
MSU_BUILD_DATE=$(git show -s --format=%ci "${MSU_BUILD_HASH}")
{
echo "MSU_BUILD_HASH='${MSU_BUILD_HASH}'"
echo "MSU_BUILD_DATE='${MSU_BUILD_DATE}'"
} >> "${MSU_LIB}"/metadata.sh
fi


echo "${MARKER} storing installation configuration"
{
echo "MSU_INSTALL_LIB='${LIB}'"
echo "MSU_INSTALL_BIN='${BIN}'"
echo "MSU_INSTALL_MAN='${MAN}'"
echo "MSU_BUILD_HASH='${MSU_BUILD_HASH}'"
echo "MSU_BUILD_DATE='${MSU_BUILD_DATE}'"
} >> "${MSU_LIB}"/metadata.sh


Expand Down
20 changes: 15 additions & 5 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ RELEASE=${MSU_VERSION}
export RELEASE


log "building any raw files"
make build


log "run the tests"
make test


log "building any raw files"
make build


log "creating directory for releases"
RELEASE_DIR="msu-${MSU_VERSION}"
RELEASE_TARBALL="msu-${MSU_VERSION}.tar.gz"
Expand All @@ -45,8 +45,18 @@ mkdir "${RELEASE_DIR}"
log "copying the contents of the working directory"
# shellcheck disable=SC2010
ls \
| grep -Ev "deps|get.sh|install.sh|Makefile|package.json|msu\-|release.sh|test" \
| grep -Ev "deps|get.sh|Makefile|package.json|msu\-|release.sh|test" \
| xargs -I{} cp -rf {} "${RELEASE_DIR}/"
rm "${RELEASE_DIR}"/docs/man/**/*.txt


log "generating metadata"
MSU_BUILD_HASH=$(git rev-parse HEAD)
MSU_BUILD_DATE=$(git show -s --format=%ci "${MSU_BUILD_HASH}")
{
echo "MSU_BUILD_HASH='${MSU_BUILD_HASH}'"
echo "MSU_BUILD_DATE='${MSU_BUILD_DATE}'"
} >> "${RELEASE_DIR}"/lib/metadata.sh


log "creating a tarball of the release"
Expand Down

0 comments on commit 38ce383

Please sign in to comment.