From 3aa8448f667c4b99ac6277d9ef6546e385af3ec9 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sun, 7 Nov 2004 13:51:55 +0000 Subject: [PATCH] Fixing typo in snapshot_template.spec and closing bug #70321. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@479 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- catalyst | 4 ++-- examples/snapshot_template.spec | 2 +- livecd/runscript-support/gamecdfs-update.sh | 10 +++++----- livecd/runscript-support/livecdfs-update.sh | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7b68304..cfbbf542 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.108 2004/11/02 23:23:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.109 2004/11/07 13:51:55 wolf31o2 Exp $ + + 07 Nov 2004; Chris Gianelloni catalyst, + examples/snapshot_template.spec, + livecd/runscript-support/gamecdfs-update.sh, + livecd/runscript-support/livecdfs-update.sh: + Fixing typo in snapshot_template.spec and closing bug #70321. 02 Nov 2004; Chris Gianelloni livecd/runscript-support/pre-kmerge.sh: diff --git a/catalyst b/catalyst index 4226650a..4ab0ce7b 100755 --- a/catalyst +++ b/catalyst @@ -1,14 +1,14 @@ #!/usr/bin/python # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.52 2004/10/21 17:06:21 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.53 2004/11/07 13:51:55 wolf31o2 Exp $ # Maintained in full by John Davis import os,sys,imp,string,getopt __maintainer__="John Davis " -__version__="1.1.0" +__version__="1.1.2" conf_values={} diff --git a/examples/snapshot_template.spec b/examples/snapshot_template.spec index 80c93dae..31e3abc5 100644 --- a/examples/snapshot_template.spec +++ b/examples/snapshot_template.spec @@ -3,7 +3,7 @@ ## John Davis # lets catalyst know what it is building -target: snaphost +target: snapshot # marks the tarball and makes it unique. Usually, this is a date. # example: diff --git a/livecd/runscript-support/gamecdfs-update.sh b/livecd/runscript-support/gamecdfs-update.sh index 723f6bbd..da85b37d 100644 --- a/livecd/runscript-support/gamecdfs-update.sh +++ b/livecd/runscript-support/gamecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/gamecdfs-update.sh,v 1.2 2004/07/26 19:37:20 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/gamecdfs-update.sh,v 1.3 2004/11/07 13:51:55 wolf31o2 Exp $ # These variables are to be used for creating the menu entry and also to tell # the CD what to execute @@ -9,12 +9,12 @@ GAME_NAME="Unreal Tournament 2004 Demo" GAME_SHORT_NAME="UT2004 Demo" GAME_EXECUTABLE="/usr/games/bin/ut2004demo" -sed -i -e 's:localhost:localhost livecd:' /etc/hosts -sed -i -e 's:GAME_NAME:${GAME_NAME}:' /etc/motd -sed -i -e 's:GAME_EXECUTABLE:${GAME_EXECUTABLE}:' /etc/X11/xinit/xinitrc +sed -i -e "s:localhost:livecd.gentoo localhost:" /etc/hosts +sed -i -e "s:GAME_NAME:${GAME_NAME}:" /etc/motd +sed -i -e "s:GAME_EXECUTABLE:${GAME_EXECUTABLE}:" /etc/X11/xinit/xinitrc [ -x /sbin/openglify ] && /sbin/openglify -touch /etc/asound.state # /etc/startx +touch /etc/asound.state /etc/startx cat > /usr/share/fluxbox/menu << EOF diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh index d8ad4a46..ae481f7a 100755 --- a/livecd/runscript-support/livecdfs-update.sh +++ b/livecd/runscript-support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.19 2004/10/22 04:23:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.20 2004/11/07 13:51:55 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -142,5 +142,5 @@ then fi # tar up the firmware so that it does not get clobbered by the livecd mounts -[ -n $(ls /usr/lib/hotplug/firmware) ] && tar cvjpf /usr/lib/hotplug/firmware.tar.bz2 /usr/lib/hotplug/firmware/* +[ -n "$(ls /usr/lib/hotplug/firmware)" ] && tar cvjpf /usr/lib/hotplug/firmware.tar.bz2 /usr/lib/hotplug/firmware/* ln -sf /lib/firmware /usr/lib/hotplug/firmware -- 2.26.2