code.vuplus.com Git - vuplus_openembedded/blob - packages/e17/entrance/config-db.patch

   1 Index: entrance-0.9.0.009/data/config/build_config.sh.in
   2 ===================================================================
   3 --- entrance-0.9.0.009.orig/data/config/build_config.sh.in
   4 +++ entrance-0.9.0.009/data/config/build_config.sh.in
   5 @@ -1,45 +1,45 @@
   6  #!/bin/sh -e
   7
   8 -usage() {
   9 -       cat <<-EOF
  10 -       Usage: $0 [options]
  11 -
  12 -       Options:
  13 -         -d, --dir     Session directory to scan
  14 -         -c, --file    Config file (default: $DB)
  15 -         -h, --help    This help output :p
  16 -       EOF
  17 -
  18 -       if [ "$1" = "1" ] ; then
  19 -               echo ""
  20 -               echo "ERROR: $2"
  21 -       fi
  22 -
  23 -       exit $1
  24 -}
  25 -
  26 -SESSION_DIR=""
  27 -DB="./entrance_config.cfg"
  28 -
  29 -while [ -n "$1" ] ; do
  30 -       case $1 in
  31 -               -d) shift; SESSION_DIR=$1;;
  32 -               -c) shift; DB=$1;;
  33 -               -h) usage 0;;
  34 -               *)  usage 1 "Unknown option: $1";;
  35 -       esac
  36 -       shift
  37 -done
  38 -
  39 -if [ -z "$DB" ] || [ -d "$DB" ] ; then
  40 -       usage 1 "Invalid DB argument"
  41 -fi
  42 -
  43 -FROM=$SESSION_DIR
  44 -if [ -z "$FROM" ] ; then
  45 -       FROM="defaults"
  46 -fi
  47 -echo "Generating config file '$DB' from '$FROM' ..."
  48 +#usage() {
  49 +#      cat <<-EOF
  50 +#      Usage: $0 [options]
  51 +#
  52 +#      Options:
  53 +#        -d, --dir     Session directory to scan
  54 +#        -c, --file    Config file (default: $DB)
  55 +#        -h, --help    This help output :p
  56 +#      EOF
  57 +#
  58 +#      if [ "$1" = "1" ] ; then
  59 +#              echo ""
  60 +#              echo "ERROR: $2"
  61 +#      fi
  62 +#
  63 +#      exit $1
  64 +#}
  65 +#
  66 +#SESSION_DIR=""
  67 +#DB="./entrance_config.cfg"
  68 +#
  69 +#while [ -n "$1" ] ; do
  70 +#      case $1 in
  71 +#              -d) shift; SESSION_DIR=$1;;
  72 +#              -c) shift; DB=$1;;
  73 +#              -h) usage 0;;
  74 +#              *)  usage 1 "Unknown option: $1";;
  75 +#      esac
  76 +#      shift
  77 +#done
  78 +#
  79 +#if [ -z "$DB" ] || [ -d "$DB" ] ; then
  80 +#      usage 1 "Invalid DB argument"
  81 +#fi
  82 +#
  83 +#FROM=$SESSION_DIR
  84 +#if [ -z "$FROM" ] ; then
  85 +#      FROM="defaults"
  86 +#fi
  87 +#echo "Generating config file '$DB' from '$FROM' ..."
  88
  89  rm -f $DB || exit 1
  90
  91 @@ -59,10 +59,10 @@ ecore_config -c $DB -k /entrance/time_fo
  92  #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/"
  93  #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
  94  ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
  95 -ecore_config -c $DB -k /entrance/greeting/after -s ""
  96 +ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE"
  97
  98  count=0
  99 -ecore_config -c $DB -k /entrance/session/0/session -s "default"
 100 +ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment"
 101  ecore_config -c $DB -k /entrance/session/0/title -s "Default"
 102  ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
 103  #if [ -z "$SESSION_DIR" ] ; then
 104 @@ -92,7 +92,7 @@ ecore_config -c $DB -k /entrance/session
 105  #      done
 106  #fi
 107  count=`(expr $count + 1)`
 108 -ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
 109 +ecore_config -c $DB -k /entrance/session/$count/session -s "/etc/X11/Sessions/Enlightenment"
 110  ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
 111  ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
 112  count=`(expr $count + 1)`
 113 @@ -107,5 +107,5 @@ ecore_config -c $DB -k /entrance/autolog
 114  ecore_config -c $DB -k /entrance/presel/mode -i 1
 115
 116  # for Entranced
 117 -ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp@ENTRANCE_VT_ARG@"
 118 +ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
 119  ecore_config -c $DB -k /entranced/attempts -i 5