1 diff -ur services.orig/af-defines.sh services/af-defines.sh
2 --- services.orig/af-defines.sh 2005-06-14 16:25:27.000000000 +0200
3 +++ services/af-defines.sh 2005-06-14 16:32:54.000000000 +0200
7 # no existence check because user does not have rights to delete the file
8 -source /etc/osso-af-init/locale
9 +. /etc/osso-af-init/locale
11 # The MyDocs directory
12 export MYDOCSDIR=$HOME/MyDocs
13 diff -ur services.orig/dbus-sessionbus.sh services/dbus-sessionbus.sh
14 --- services.orig/dbus-sessionbus.sh 2005-06-14 16:25:27.000000000 +0200
15 +++ services/dbus-sessionbus.sh 2005-06-14 16:32:54.000000000 +0200
19 if [ $START = TRUE ]; then
20 - source $LAUNCHWRAPPER_NICE start "$SVC" $PROG --session
21 + . $LAUNCHWRAPPER_NICE start "$SVC" $PROG --session
23 # giving parameter also here so that dsmetool works...
24 - source $LAUNCHWRAPPER_NICE stop "$SVC" $PROG --session
25 + . $LAUNCHWRAPPER_NICE stop "$SVC" $PROG --session
27 Only in services: fixsource.sh~
28 diff -ur services.orig/real-af-base-apps services/real-af-base-apps
29 --- services.orig/real-af-base-apps 2005-06-14 16:25:27.000000000 +0200
30 +++ services/real-af-base-apps 2005-06-14 16:32:54.000000000 +0200
34 AF_DEFS=$DIR/af-defines.sh
35 -source $AF_DEFS || exit 2
43 if [ $START = TRUE ]; then
44 - source $DIR/osso-gtk.defs
45 + . $DIR/osso-gtk.defs
47 if [ -f $DIR/tasknav.defs ]; then
48 - source $DIR/tasknav.defs
51 - source $DIR/tasknav.sh start
52 + . $DIR/tasknav.sh start
54 # first evil sleep hack in attempt to boost Task Navigator startup
55 # (this should also reduce context switches)
58 if [ -f $DIR/home.defs ]; then
59 - source $DIR/home.defs
62 - source $DIR/home.sh start
63 + . $DIR/home.sh start
65 # second evil sleep hack in attempt to boost Home startup
68 if [ -f $DIR/statusbar.defs ]; then
69 - source $DIR/statusbar.defs
70 + . $DIR/statusbar.defs
72 - source $DIR/statusbar.sh start
73 + . $DIR/statusbar.sh start
75 if [ -f $DIR/ke-recv.sh ]; then
76 - source $DIR/ke-recv.sh start
77 + . $DIR/ke-recv.sh start
80 if [ -f $DIR/keyboard.defs ]; then
81 - source $DIR/keyboard.defs
82 + . $DIR/keyboard.defs
84 - source $DIR/keyboard.sh start
85 + . $DIR/keyboard.sh start
87 # LD_PRELOAD script (only for media-server)
88 LDPRELOADSCRIPT=/usr/bin/connectivity_preload.sh
89 if [ -f $LDPRELOADSCRIPT ]; then
90 - source $LDPRELOADSCRIPT
93 if [ -x $DIR/osso-media-server.sh ]; then
94 $DIR/osso-media-server.sh start
98 if [ -x /usr/bin/clipboard-manager ]; then
99 - source $LAUNCHWRAPPER start clipboard-manager /usr/bin/clipboard-manager
100 + . $LAUNCHWRAPPER start clipboard-manager /usr/bin/clipboard-manager
103 if [ -x /usr/bin/clipboard-manager ]; then
104 - source $LAUNCHWRAPPER stop clipboard-manager /usr/bin/clipboard-manager
105 + . $LAUNCHWRAPPER stop clipboard-manager /usr/bin/clipboard-manager
107 - source $DIR/keyboard.sh stop
108 + . $DIR/keyboard.sh stop
109 if [ -f $DIR/ke-recv.sh ]; then
110 - source $DIR/ke-recv.sh stop
111 + . $DIR/ke-recv.sh stop
113 - source $DIR/statusbar.sh stop
114 - source $DIR/home.sh stop
115 - source $DIR/tasknav.sh stop
116 + . $DIR/statusbar.sh stop
117 + . $DIR/home.sh stop
118 + . $DIR/tasknav.sh stop
120 diff -ur services.orig/real-af-services services/real-af-services
121 --- services.orig/real-af-services 2005-06-14 16:25:27.000000000 +0200
122 +++ services/real-af-services 2005-06-14 16:32:54.000000000 +0200
124 DIR=/etc/osso-af-init
126 AF_DEFS=$DIR/af-defines.sh
127 -source $AF_DEFS || exit 2
128 +. $AF_DEFS || exit 2
134 if [ $START = TRUE ]; then
135 # GConf daemon (probably started already by D-BUS)
136 - source $DIR/gconf-daemon.sh start
137 + . $DIR/gconf-daemon.sh start
139 # Must be before D-BUS session bus is started!
140 - source $DIR/osso-gtk.defs
141 + . $DIR/osso-gtk.defs
143 # opera needs some definitions
144 if [ -f $DIR/browser.defs ]; then
145 - source $DIR/browser.defs
146 + . $DIR/browser.defs
148 # LD_PRELOAD script (only for the session bus environment)
149 LDPRELOADSCRIPT=/usr/bin/connectivity_preload.sh
150 if [ -f $LDPRELOADSCRIPT ]; then
151 - source $LDPRELOADSCRIPT
154 - source $DIR/dbus-sessionbus.sh start
155 + . $DIR/dbus-sessionbus.sh start
158 # Wait until X is ready
163 - source $DIR/sapwood-server.sh start
164 + . $DIR/sapwood-server.sh start
166 if [ -f $DIR/matchbox.defs ]; then
167 - source $DIR/matchbox.defs
168 + . $DIR/matchbox.defs
170 - source $DIR/matchbox.sh start
171 + . $DIR/matchbox.sh start
173 # wait until system D-BUS is ready (some stuff started by init
174 # after us assume it is running)
176 # LD_PRELOAD script (only for media-server)
177 LDPRELOADSCRIPT=/usr/bin/connectivity_preload.sh
178 if [ -f $LDPRELOADSCRIPT ]; then
179 - source $LDPRELOADSCRIPT
182 if [ -x $DIR/osso-media-server.sh ]; then
183 $DIR/osso-media-server.sh start
187 $DIR/osso-media-server.sh stop
188 - source $DIR/matchbox.sh stop
189 - source $DIR/sapwood-server.sh stop
190 - source $DIR/dbus-sessionbus.sh stop
191 - source $DIR/gconf-daemon.sh stop
192 + . $DIR/matchbox.sh stop
193 + . $DIR/sapwood-server.sh stop
194 + . $DIR/dbus-sessionbus.sh stop
195 + . $DIR/gconf-daemon.sh stop
197 diff -ur services.orig/real-af-startup services/real-af-startup
198 --- services.orig/real-af-startup 2005-06-14 16:25:27.000000000 +0200
199 +++ services/real-af-startup 2005-06-14 16:32:54.000000000 +0200
201 DIR=/etc/osso-af-init
203 AF_DEFS=$DIR/af-defines.sh
204 -source $AF_DEFS || exit 2
205 +. $AF_DEFS || exit 2
211 if [ $START = TRUE ]; then
212 # Wizards and Connectivity use Gtk
213 - source $DIR/osso-gtk.defs
214 + . $DIR/osso-gtk.defs
216 if [ -x /sbin/devlock-blocker ]; then
217 # this blocks until the device is unlocked
219 if [ -x /usr/bin/suw -a -e $HOME/first-boot-flag ]; then
220 # we need to start VKB for the wizard...
221 if [ -f $DIR/keyboard.defs ]; then
222 - source $DIR/keyboard.defs
223 + . $DIR/keyboard.defs
225 - source $DIR/keyboard.sh start
226 + . $DIR/keyboard.sh start
227 # give VKB some time to start
229 rm -f $HOME/first-boot-flag