[SCM] live-helper branch, debian-next, updated. debian/2.0_a8-1-8-g1db2027
Daniel Baumann
daniel at debian.org
Sun Mar 7 10:54:47 UTC 2010
The following commit has been merged in the debian-next branch:
commit 9cfc9a8a70934e87f178942bf59051bb8cf2cc9c
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 7 11:40:10 2010 +0100
Removing outdated crontab and cronjob examples.
diff --git a/examples/cron/crontab b/examples/cron/crontab
deleted file mode 100644
index 960f5e9..0000000
--- a/examples/cron/crontab
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/crontab - system-wide crontab
-
-SHELL=/bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-# m h dom mon dow user command
-*/10 * * * * user /usr/share/doc/live-helper/examples/cron/manpages.sh > /dev/null 2>&1
-*/10 * * * * user /usr/share/doc/live-helper/examples/cron/snapshots.sh > /dev/null 2>&1
diff --git a/examples/cron/manpages.sh b/examples/cron/manpages.sh
deleted file mode 100755
index 00f49df..0000000
--- a/examples/cron/manpages.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Needs: man2html git-core
-
-# Static variables
-PACKAGES="live-helper live-initramfs"
-
-TEMPDIR="/srv/tmp/manpages"
-SERVER="/srv/debian-live/www/other/manpages"
-
-DATE_START="$(date -R)"
-HOST="$(hostname)"
-
-# Checking lock file
-if [ -f "${SERVER}"/lock ]
-then
- echo "E: locked."
- exit 1
-fi
-
-# Creating server directory
-if [ ! -d "${SERVER}" ]
-then
- mkdir -p "${SERVER}"
-fi
-
-# Creating lock trap
-trap "test -f ${SERVER}/lock && rm -f ${SERVER}/lock; exit 0" 0 HUP INT QUIT KILL TERM
-
-# Creating lock file
-echo "${DATE_START}" > "${SERVER}"/lock
-
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-helper: begin manpage build." >> /var/log/live
-
-# Remove old manpages
-rm -f "${SERVER}"/*.html
-
-# Processing packages
-for PACKAGE in ${PACKAGES}
-do
- # Cleaning build directory
- if [ -d "${TEMPDIR}" ]
- then
- rm -rf "${TEMPDIR}"
- fi
-
- # Creating build directory
- mkdir -p "${TEMPDIR}"
-
- # Getting sources
- cd "${TEMPDIR}"
- git clone git://git.debian.org/git/users/daniel/${PACKAGE}.git
-
- # Building manpages
- for MANPAGE in "${TEMPDIR}"/${PACKAGE}/manpages/*
- do
- man2html -D "${SERVER}"/ -r ${MANPAGE} | \
- sed -e "s#Content-type: text/html##" \
- -e 's#HREF="../index.html"#HREF="./"#' \
- -e 's#HREF="../man1/#HREF="#g' \
- -e 's#HREF="../man2/#HREF="#g' \
- -e 's#HREF="../man3/#HREF="#g' \
- -e 's#HREF="../man4/#HREF="#g' \
- -e 's#HREF="../man5/#HREF="#g' \
- -e 's#HREF="../man6/#HREF="#g' \
- -e 's#HREF="../man7/#HREF="#g' \
- -e 's#HREF="../man8/#HREF="#g' \
- -e 's#HREF="../man9/#HREF="#g' \
- -e 's#/cgi-bin/man/man2html#http://packages.debian.org/man2html#' \
- > "${SERVER}"/$(basename ${MANPAGE}).html
- done
-
- # Removing sources
- rm -rf "${TEMPDIR}"/${PACKAGE}
-
- cd "${OLDPWD}"
-done
-
-# Creating symlinks
-for NUMBER in 1 2 3 4 5 6 7 8 9
-do
- for MANPAGE in "${SERVER}"/*.en.${NUMBER}.html
- do
- if [ -f "${MANPAGE}" ]
- then
- ln -s $(basename ${MANPAGE}) "${SERVER}"/$(basename ${MANPAGE} .en.${NUMBER}.html).${NUMBER}.html
- fi
- done
-done
-
-# Writing timestamp
-cat > "${SERVER}"/LAST_BUILD << EOF
-Last run begin: ${DATE_START}
-Last run end: $(date -R)
-EOF
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-helper: end manpage build." >> /var/log/live
diff --git a/examples/cron/snapshots.sh b/examples/cron/snapshots.sh
deleted file mode 100755
index 4c6290f..0000000
--- a/examples/cron/snapshots.sh
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/bin/sh -e
-
-# Static variables
-if [ -n "${1}" ]
-then
- PACKAGES="${@}"
-else
- PACKAGES="live-helper live-initramfs live-initscripts live-webhelper live-magic debian-unofficial-archive-keyring"
-fi
-
-DEBEMAIL="debian-live at lists.debian.org"
-EMAIL="debian-live at lists.debian.org"
-DEBFULLNAME="Debian Live Autobuilder"
-NAME="Debian Live Autobuilder"
-KEY="FDB8D39A"
-
-export DEBEMAIL EMAIL DEBFULLNAME NAME KEY
-
-TEMPDIR="$(mktemp -d -t debian-live.XXXXXXXX)"
-SERVER="/mnt/daniel1/srv/debian-unofficial/live/debian"
-LOGFILE="${SERVER}/build.log"
-
-DATE_START="$(date -R)"
-HOST="$(hostname)"
-
-# Checking lock file
-if [ -f "${SERVER}"/Archive-Update-in-Progress ]
-then
- echo "E: locked."
- exit 1
-fi
-
-# Creating server directory
-if [ ! -d "${SERVER}" ]
-then
- mkdir -p "${SERVER}"
-fi
-
-# Creating lock trap
-trap "test -f ${SERVER}/Archive-Update-in-Progress && rm -f ${SERVER}/Archive-Update-in-Progress; exit 0" 0 HUP INT QUIT KILL TERM
-
-# Creating lock file
-echo "${DATE_START}" > "${SERVER}"/Archive-Update-in-Progress
-
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-snapshots: begin build." >> "${LOGFILE}"
-
-# Processing packages
-for PACKAGE in ${PACKAGES}
-do
- # Cleaning build directory
- if [ -d "${TEMPDIR}" ]
- then
- rm -rf "${TEMPDIR}"
- fi
-
- # Creating build directory
- mkdir -p "${TEMPDIR}"
-
- # Getting sources
- cd "${TEMPDIR}"
-
- case "${PACKAGE}" in
- debian-unofficial-archive-keyring)
- git clone git://git.debian.net/git/${PACKAGE}.git
- ;;
-
- live-magic)
- git clone git://git.debian.org/git/users/lamby-guest/${PACKAGE}.git
- ;;
-
- *)
- git clone git://git.debian.org/git/users/daniel/${PACKAGE}.git
- ;;
- esac
-
- # Getting version
- cd "${TEMPDIR}"/${PACKAGE}
-
- for BRANCH in debian
- do
- if [ -n "$(git branch -r | grep ${BRANCH})" ]
- then
- git checkout -b ${BRANCH} origin/${BRANCH} || true
- fi
- done
-
- VERSION="$(dpkg-parsechangelog | awk '/Version:/ { print $2 }' | awk -F- '{ print $1 }')"
-
- # Getting revision
- cd "${TEMPDIR}"/${PACKAGE}
- REVISION="$(git log | grep -m1 Date | awk -FDate: '{ print $2 }' | awk '{ print $1 ",", $3, $2, $5, $4, $6 }')"
- REVISION="$(date -d "${REVISION}" +%Y%m%d.%H%M%S)"
-
- # Check for existing package
- if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}+${REVISION}.dsc ] || [ "${1}" = "--force" ]
- then
- UPDATE_INDICES="true"
-
- # Renaming directory
- mv "${TEMPDIR}"/${PACKAGE} "${TEMPDIR}"/${PACKAGE}-${VERSION}+${REVISION}
-
- # Building package
- cd "${TEMPDIR}"/${PACKAGE}-${VERSION}+${REVISION}
- rm -rf .git
- dch --force-bad-version --newversion ${VERSION}+${REVISION} --distribution UNRELEASED Autobuild snapshot of git ${REVISION}.
- dpkg-buildpackage -rfakeroot -k${KEY} -sa
-
- # Removing sources
- rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}+${REVISION}
-
- # Creating directory
- mkdir -p "${SERVER}"
-
- # Removing old packages
- if [ -f "${SERVER}"/"${PACKAGE}"*.changes ]
- then
- for FILE in $(awk {'print $5'} "${SERVER}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$")
- do
- rm -f "${SERVER}"/"${FILE}"
- done
- fi
-
- rm -f "${SERVER}"/"${PACKAGE}"*.changes
-
- # Installing new packages
- for FILE in $(awk {'print $5'} "${TEMPDIR}"/"${PACKAGE}"*.changes | grep -e ".*\.deb$" -e ".*\.diff.gz$" -e ".*\.dsc$" -e ".*\.tar.gz$" -e ".*\.udeb$")
- do
- mv "${TEMPDIR}"/"${FILE}" "${SERVER}"
- done
-
- mv "${TEMPDIR}"/"${PACKAGE}"*.changes "${SERVER}"
- else
- # Remove sources
- rm -rf "${TEMPDIR}"/${PACKAGE}
- fi
-done
-
-if [ "${UPDATE_INDICES}" = "true" ]
-then
- LAST_UPDATE="$(date -R)"
-
- cd "${SERVER}"
-
- apt-ftparchive packages . /dev/null > Packages
- gzip -9 -c Packages > Packages.gz
- bzip2 -9 -c Packages > Packages.bz2
-
- apt-ftparchive sources . /dev/null > Sources
- gzip -9 -c Sources > Sources.gz
- bzip2 -9 -c Sources > Sources.bz2
-
- if [ -f release.conf ]
- then
- apt-ftparchive -c release.conf -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release ./ >> Release.tmp
- mv Release.tmp Release
-
- rm -f Release.gpg
- gpg --default-key ${KEY} --quiet --output Release.gpg -ba Release
- fi
-fi
-
-# Reading timestamp
-if [ -z "${LAST_UPDATE}" ]
-then
- LAST_UPDATE="$(awk -F: '/Last update:/ { print $2":"$3":"$4 }' ${SERVER}/LAST_BUILD | sed -e 's/ //')"
-fi
-
-# Writing timestamp
-cat > "${SERVER}"/LAST_BUILD << EOF
-Last run begin: ${DATE_START}
-Last run end: $(date -R)
-
-Last update: ${LAST_UPDATE}
-EOF
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Fixing permissions
-chmod 0644 "${SERVER}"/*
-chmod 0766 "${SERVER}"/*.sh
-
-echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-snapshots: end build." >> "${LOGFILE}"
--
live-helper
More information about the debian-live-changes
mailing list