1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
Index: entrance-0.9.0.009/data/config/build_config.sh.in
===================================================================
--- entrance-0.9.0.009.orig/data/config/build_config.sh.in
+++ entrance-0.9.0.009/data/config/build_config.sh.in
@@ -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=""
-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' ..."
+#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' ..."
rm -f $DB || exit 1
@@ -59,10 +59,10 @@ ecore_config -c $DB -k /entrance/time_fo
#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 @@ ecore_config -c $DB -k /entrance/session
# 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/autolog
ecore_config -c $DB -k /entrance/presel/mode -i 1
# for Entranced
-ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -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
|
