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

diff --git a/ChangeLog b/ChangeLog
index f7b68304a73802dbacf16f89cd764afb9bb125bc..cfbbf542b08a3a68643ba66bf9d89ef93d4f5e7c 100644 (file)
--- 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 <wolf31o2@gentoo.org> 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 <wolf31o2@gentoo.org>
   livecd/runscript-support/pre-kmerge.sh:

diff --git a/catalyst b/catalyst
index 4226650a1c7b3a40e04396dd048837fe0fc33ea0..4ab0ce7b60b6c2f7d903b70d25095575f8c10f23 100755 (executable)
--- 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 <zhen@gentoo.org>
 
 import os,sys,imp,string,getopt
 
 __maintainer__="John Davis <zhen@gentoo.org>"
-__version__="1.1.0"
+__version__="1.1.2"
 
 conf_values={}
 

diff --git a/examples/snapshot_template.spec b/examples/snapshot_template.spec
index 80c93dae36ec03f91b834364a3dbaf58a75fbbdd..31e3abc5f8d35e9bb8fda6bd9fce895ff1daabaf 100644 (file)
--- a/examples/snapshot_template.spec
+++ b/examples/snapshot_template.spec
@@ -3,7 +3,7 @@
 ## John Davis <zhen@gentoo.org>
 
 # 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 723f6bbda4e8a3eb37948d927f9ed607d1438df4..da85b37dde315e4d8d4819768980098892f2e6a9 100644 (file)
--- 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 d8ad4a4682a9ece20762e639241fc9091a4ef4ae..ae481f7aff2eef0d411dee2e26131b9aa7d0290b 100755 (executable)
--- 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