[Debian-live-changes] r2071 - in configs/webconverger: . config/chroot_local-packageslists

[kai-guest at alioth.debian.org]

Author: kai-guest
Date: 2007-06-13 12:13:15 +0000 (Wed, 13 Jun 2007)
New Revision: 2071

Modified:
   configs/webconverger/config/chroot_local-packageslists/webconverger
   configs/webconverger/deploy-webc.sh
Log:
bleed

Modified: configs/webconverger/config/chroot_local-packageslists/webconverger
===================================================================
--- configs/webconverger/config/chroot_local-packageslists/webconverger	2007-06-13 12:02:54 UTC (rev 2070)
+++ configs/webconverger/config/chroot_local-packageslists/webconverger	2007-06-13 12:13:15 UTC (rev 2071)
@@ -4,9 +4,15 @@
 # Minimal
 eject file
 
+# For upgrade, firewall et al. features
+live-sysvinit
+
 # Standard
 console-common locales kbd
-webconverger-usplash 
+#usplash-theme-webconverger
+usplash-theme-ubuntu
+#usplash-theme-debian
+#webconverger-usplash 
 webconverger-base
 
 # for backports

Modified: configs/webconverger/deploy-webc.sh
===================================================================
--- configs/webconverger/deploy-webc.sh	2007-06-13 12:02:54 UTC (rev 2070)
+++ configs/webconverger/deploy-webc.sh	2007-06-13 12:13:15 UTC (rev 2071)
@@ -1,43 +1,47 @@
 #!/bin/sh -e
 # For deploying Webconverger images
 # hendry at webconverger.org
+OUTPUT=/org/out
 
 [ $1 ] || exit
-DIR=`basename $1`
-TYPE=`echo $DIR | awk -F - '{print $NF}'` # gets word after last dash
+DIR=$1
+TYPE=`basename $DIR | awk -F - '{print $NF}' | tr / ' '` # gets word after last dash
 
+echo $DIR
+echo $TYPE
+
 case $TYPE in
     fr)
     echo France
-    PUBDIR=~/www/i18n/$TYPE
+    PUBDIR=$OUTPUT/i18n/$TYPE
     break
     ;;
     de)
     echo Germany
-    PUBDIR=~/www/i18n/$TYPE
+    PUBDIR=$OUTPUT/i18n/$TYPE
     break
     ;;
     ko)
     echo Korea/Hannux
-    PUBDIR=~/www/i18n/$TYPE
+    PUBDIR=$OUTPUT/i18n/$TYPE
     break
     ;;
     cn)
     echo China
-    PUBDIR=~/www/i18n/$TYPE
+    PUBDIR=$OUTPUT/i18n/$TYPE
     ;;
     es)
     echo Spanish
-    PUBDIR=~/www/i18n/$TYPE
+    PUBDIR=$OUTPUT/i18n/$TYPE
     ;;
     webconverger)
     echo Default Webconverger
     TYPE="en"
-    PUBDIR=~/www/i18n/$TYPE
+    PUBDIR=$OUTPUT/i18n/$TYPE
     ;;
     tor)
     echo Tor
-    PUBDIR=~/www/$TYPE
+    PUBDIR=$OUTPUT/$TYPE
     ;;
     *)
     echo Unsupported $TYPE