Index: entrance/data/config/build_config.sh.in =================================================================== --- entrance.orig/data/config/build_config.sh.in 2009-02-17 10:59:01.000000000 +0000 +++ entrance/data/config/build_config.sh.in 2009-02-17 13:45:06.000000000 +0000 @@ -1,45 +1,45 @@ #!/bin/sh -e -usage() { - cat <<-EOF - Usage: $0 [options] - - Options: - -d, --dir Session directory to scan - -c, --file Config file (default: $DB) - -h, --help This help output :p - EOF - - if [ "$1" = "1" ] ; then - echo "" - echo "ERROR: $2" - fi - - exit $1 -} - -SESSION_DIR="" +#usage() { +# cat <<-EOF +# Usage: $0 [options] +# +# Options: +# -d, --dir Session directory to scan +# -c, --file Config file (default: $DB) +# -h, --help This help output :p +# EOF +# +# if [ "$1" = "1" ] ; then +# echo "" +# echo "ERROR: $2" +# fi +# +# exit $1 +#} +# +#SESSION_DIR="" DB="./entrance_config.cfg" - -while [ -n "$1" ] ; do - case $1 in - -d) shift; SESSION_DIR=$1;; - -c) shift; DB=$1;; - -h) usage 0;; - *) usage 1 "Unknown option: $1";; - esac - shift -done - -if [ -z "$DB" ] || [ -d "$DB" ] ; then - usage 1 "Invalid DB argument" -fi - -FROM=$SESSION_DIR -if [ -z "$FROM" ] ; then - FROM="defaults" -fi -echo "Generating config file '$DB' from '$FROM' ..." +# +#while [ -n "$1" ] ; do +# case $1 in +# -d) shift; SESSION_DIR=$1;; +# -c) shift; DB=$1;; +# -h) usage 0;; +# *) usage 1 "Unknown option: $1";; +# esac +# shift +#done +# +#if [ -z "$DB" ] || [ -d "$DB" ] ; then +# usage 1 "Invalid DB argument" +#fi +# +#FROM=$SESSION_DIR +#if [ -z "$FROM" ] ; then +# FROM="defaults" +#fi +echo "Generating config file '$DB' ..." rm -f $DB || exit 1 @@ -59,10 +59,10 @@ #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/" #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/" ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to" -ecore_config -c $DB -k /entrance/greeting/after -s "" +ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE" count=0 -ecore_config -c $DB -k /entrance/session/0/session -s "default" +ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment" ecore_config -c $DB -k /entrance/session/0/title -s "Default" ecore_config -c $DB -k /entrance/session/0/icon -s "default.png" #if [ -z "$SESSION_DIR" ] ; then @@ -92,7 +92,7 @@ # done #fi count=`(expr $count + 1)` -ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe" +ecore_config -c $DB -k /entrance/session/$count/session -s "/etc/X11/Sessions/Enlightenment" ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe" ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png" count=`(expr $count + 1)` @@ -107,5 +107,5 @@ ecore_config -c $DB -k /entrance/presel/mode -i 1 # for Entranced -ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -br -nolisten tcp@ENTRANCE_VT_ARG@" +ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver" ecore_config -c $DB -k /entranced/attempts -i 5