improve example scripts, add to build (Makefile)

This commit is contained in:
Hiltjo Posthuma 2017-07-30 17:21:42 +02:00
parent 4e307d3076
commit bdcf38baa4
4 changed files with 20 additions and 17 deletions

View file

@ -40,7 +40,7 @@ dist:
mkdir -p ${NAME}-${VERSION}
cp -f ${MAN1} ${HDR} ${SCRIPTS} ${SRC} ${COMPATSRC} ${DOC} \
Makefile config.mk favicon.png logo.png style.css \
example.sh \
example_create.sh example_post-receive.sh \
${NAME}-${VERSION}
# make tarball
tar -cf - ${NAME}-${VERSION} | \
@ -68,7 +68,8 @@ install: all
cp -f style.css\
favicon.png\
logo.png\
example.sh\
example_create.sh\
example_post-receive.sh\
README\
${DESTDIR}${PREFIX}/share/${NAME}
# installing manual pages.
@ -84,7 +85,8 @@ uninstall:
${DESTDIR}${PREFIX}/share/${NAME}/style.css\
${DESTDIR}${PREFIX}/share/${NAME}/favicon.png\
${DESTDIR}${PREFIX}/share/${NAME}/logo.png\
${DESTDIR}${PREFIX}/share/${NAME}/example.sh\
${DESTDIR}${PREFIX}/share/${NAME}/example_create.sh\
${DESTDIR}${PREFIX}/share/${NAME}/example_post-receive.sh\
${DESTDIR}${PREFIX}/share/${NAME}/README
-rmdir ${DESTDIR}${PREFIX}/share/${NAME}
# removing manual pages.

2
README
View file

@ -114,7 +114,7 @@ git post-receive hook (repo/.git/hooks/post-receive):
# ...
#fi
# see example.sh for normal creation of the files.
# see example_create.sh for normal creation of the files.
Create .tar.gz archives by tag

View file

@ -13,11 +13,11 @@
#
# Usage:
# - mkdir -p htmldir && cd htmldir
# - sh example.sh
# - sh example_create.sh
# path must be absolute.
reposdir="/var/www/domains/git.codemadness.nl/home/src"
curdir=$(pwd)
curdir="$(pwd)"
# make index.
stagit-index "${reposdir}/"*/ > "${curdir}/index.html"
@ -39,5 +39,5 @@ for dir in "${reposdir}/"*/; do
ln -sf ../logo.png logo.png
ln -sf ../favicon.png favicon.png
printf "done\n"
echo "done"
done

View file

@ -9,8 +9,8 @@
# this is the directory of the repo when called from the post-receive script.
name="$1"
if test "$name" = ""; then
name="$(basename $(pwd))"
if test "${name}" = ""; then
name=$(basename $(pwd))
fi
# config
@ -23,17 +23,17 @@ destdir="${htmldir}${stagitdir}"
cachefile=".htmlcache"
# /config
if ! test -d "$dir"; then
echo "$dir does not exist" >&2
if ! test -d "${dir}"; then
echo "${dir} does not exist" >&2
exit 1
fi
cd "$dir" || exit 1
cd "${dir}" || exit 1
# detect git push -f
force=0
while read -r old new ref; do
hasrevs=$(git rev-list "$old" "^$new" | sed 1q)
if test -n "$hasrevs"; then
hasrevs=$(git rev-list "${old}" "^${new}" | sed 1q)
if test -n "${hasrevs}"; then
force=1
break
fi
@ -47,14 +47,15 @@ printf "[%s] stagit HTML pages... " "${d}"
mkdir -p "${destdir}/${d}"
cd "${destdir}/${d}" || exit 1
# remove commits and $cachefile on git push -f, this recreated later on.
if test "$force" = "1"; then
# remove commits and ${cachefile} on git push -f, this recreated later on.
if test "${force}" = "1"; then
rm -f "${cachefile}"
rm -rf "commit"
fi
# make index.
stagit-index "${reposdir}/"*/ > "${destdir}/index.html"
# make pages.
stagit -c "${cachefile}" "${reposdir}/${r}"
@ -62,4 +63,4 @@ ln -sf log.html index.html
ln -sf ../style.css style.css
ln -sf ../logo.png logo.png
printf "done\n"
echo "done"