summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-09 23:39:02 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-09 23:39:02 +0100
commitdec4e3bed5cd5a53aab8d3d0d515fc72613d4dfa (patch)
tree87861bb831d3fd886d0aa1dc4248fb19f9ba45a8 /bin
parent3a89a56fcff5d541b4b6014be980e0bb0f034e2e (diff)
downloadjenkins.debian.net-dec4e3bed5cd5a53aab8d3d0d515fc72613d4dfa.tar.xz
fixup 3 issues with g-i-installations
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 9d662f66..441700a7 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -77,8 +77,8 @@ cleanup_all() {
# rename .bak files back to .ppm
if find . -name "*.ppm.bak" ; then
for i in *.ppm.bak ; do
- echo mv -v $i ${i%.bak.ppm}.ppm
- mv -v $i ${i%.bak.ppm}.ppm
+ echo "mv -v $i $(echo $i | sed -s 's#.ppm.bak#.ppm#')"
+ mv -v $i $(echo $i | sed -s 's#.ppm.bak#.ppm#')
done
fi
set -x
@@ -162,10 +162,14 @@ monitor_installation() {
#
# break if qemu-system has finished
#
- vncsnapshot -quiet -allowblank $DISPLAY snapshot_$(printf "%06d" $NR).jpg 2>/dev/null \
- || ( echo "could not take vncsnapshot, no qemu running on $DISPLAY" ; touch $RESULTS/qemu_quit ; break )
- convert snapshot_$(printf "%06d" $NR).jpg snapshot_$(printf "%06d" $NR).ppm
- rm snapshot_$(printf "%06d" $NR).jpg
+ vncsnapshot -quiet -allowblank $DISPLAY snapshot_$(printf "%06d" $NR).jpg 2>/dev/null || touch $RESULTS/qemu_quit
+ if [ ! -f touch $RESULTS/qemu_quit ] ; then
+ convert snapshot_$(printf "%06d" $NR).jpg snapshot_$(printf "%06d" $NR).ppm
+ rm snapshot_$(printf "%06d" $NR).jpg
+ else
+ echo "could not take vncsnapshot, no qemu running on $DISPLAY"
+ break
+ fi
# give signal we are still running
if [ $(($NR % 14)) -eq 0 ] ; then
date