X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=scripts%2Frelease_helper.sh;h=40c532d11a58084cc2bb941a18d3df9f89f8340e;hp=cbd910b6529d73cabdf487df4136bb225d1cd803;hb=4cd65718be7890b8dec7939c0af769da9bc8e320;hpb=307773cc75be42af5f2fa3f587c4e525a7353b78;ds=sidebyside

diff --git a/scripts/release_helper.sh b/scripts/release_helper.sh
index cbd910b..40c532d 100755
--- a/scripts/release_helper.sh
+++ b/scripts/release_helper.sh
@@ -5,21 +5,6 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
-## How to set up autobuild (for automatically updating grml-live.git and
-## build packages out of git tree and install them, e.g. for usage on
-## daily.grml.org):
-# echo "deb file:/home/grml-live-git/grml-live.build-area/ ./" >> /etc/apt/sources.list.d/grml-live.list
-# adduser --disabled-login --disabled-password grml-live-git
-# visudo -> add "grml-live-git ALL=NOPASSWD: /usr/bin/apt-get"
-# su - grml-live-git
-# mkdir /home/grml-live-git/grml-live.build-area
-# git clone git://git.grml.org/grml-live.git
-# git config --global user.name "Grml-Live Git Autobuild"
-# git config --global user.email "grml-live-git@$(hostname)"
-#
-# Finally install a cron job (as user grml-live-git) like:
-# 30 00 * * * cd /home/grml-live-git/grml-live.git/ && env AUTOBUILD=1 scripts/release_helper.sh >/home/grml-live-git/grml-live-build.log
-################################################################################
 
 set -e
 set -u
@@ -51,13 +36,15 @@ if [ -n "${AUTOBUILD:-}" ] ; then
   UNIXTIME=$(date +%s)
 
   cat > debian/changelog << EOF
-grml-live (${GRML_LIVE_VERSION}~autobuild${UNIXTIME}) UNRELEASED; urgency=low
+grml-live (${GRML_LIVE_VERSION}+autobuild${UNIXTIME}) UNRELEASED; urgency=low
 
   * Automatically built package based on the state of
     git repository at http://git.grml.org/?p=grml-live.git
-    on $DATE
+    on $DATE ->
+
+    $(git log --format=oneline -1)
 
- -- grml-live Auto Build <mika@grml.org>  $DATE
+ -- grml-live Auto Build <grml-live-git@$(hostname)>  $DATE
 
 EOF
   git add debian/changelog
@@ -108,7 +95,7 @@ fi
 printf "Building debian packages:\n"
 if [ -n "${AUTOBUILD:-}" ] ; then
   [ -d ../grml-live.build-area ] || mkdir ../grml-live.build-area
-  rm -f ../grml-live.build-area/grml-live* # otherwise we're keeping files forever...
+  rm -rf ../grml-live.build-area/grml-live* # otherwise we're keeping files forever...
   git-buildpackage --git-ignore-branch --git-ignore-new --git-export-dir=../grml-live.build-area -us -uc
 else
   git-buildpackage --git-ignore-branch --git-ignore-new $*
@@ -119,12 +106,18 @@ if [ -n "${AUTOBUILD:-}" ] ; then
    (
      cd ../grml-live.build-area
      dpkg-scanpackages . /dev/null > Packages
+     dpkg-scanpackages . /dev/null | gzip > Packages.gz
    )
    git checkout master
    git branch -D ${autobuild_branch} || true
-   sudo apt-get update
+
+   env APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none sudo apt-get update
+
    PACKAGES=$(dpkg --list grml-live\* | awk '/^ii/ {print $2}')
-   sudo apt-get -y --allow-unauthenticated install $PACKAGES
+   env APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none sudo apt-get -y \
+     -o DPkg::Options::=--force-confmiss \
+     -o DPkg::Options::=--force-confnew  \
+     --allow-unauthenticated install $PACKAGES
 fi
 
 ## END OF FILE #################################################################