rev |
line source |
pankso@4
|
1 #!/bin/sh
|
pankso@4
|
2 #
|
pankso@66
|
3 # Tazx - Ncurses X configuration for SliTaz GNU/Linux using Dialog boxes.
|
pankso@351
|
4 # This tinyutils is part of slitaz-tools. Tazx can configure Xvesa kdrive
|
pankso@351
|
5 # and Xorg with several Window Manager.
|
pankso@4
|
6 #
|
pankso@351
|
7 # (c) 2009 SliTaz GNU/Linux - GNU gpl v3.
|
pankso@209
|
8 # Authors: Christophe Lincoln <pankso@slitaz.org>
|
pankso@209
|
9 # Pascal Bellard <pascal.bellard@slitaz.org>
|
pankso@4
|
10 #
|
pascal@190
|
11 : ${DIALOG=tazdialog}
|
pankso@4
|
12
|
pankso@351
|
13 # Default value.
|
pankso@4
|
14 XSERVER=Xvesa
|
pankso@351
|
15 KEYBD=keyboard
|
pankso@351
|
16 MOUSE=mouse,5,/dev/input/mice
|
pankso@351
|
17 WM=openbox
|
pankso@351
|
18
|
pankso@339
|
19 # Default user for config files in Live mode.
|
pankso@415
|
20 USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1`
|
pankso@4
|
21
|
pankso@66
|
22 ####################
|
pankso@66
|
23 # Tazx functions #
|
pankso@66
|
24 ####################
|
pankso@66
|
25
|
pankso@260
|
26 # Patch xorg.conf to set keymap layout.
|
pankso@260
|
27 patch_xorg_kbd()
|
pankso@260
|
28 {
|
pankso@260
|
29 KEYMAP=`cat /etc/keymap.conf`
|
pankso@260
|
30 case $KEYMAP in
|
pankso@260
|
31 fr_CH-latin1)
|
pankso@260
|
32 # Swiss FrenCH
|
pankso@260
|
33 patch -p0 <<EOF
|
pankso@260
|
34 --- /etc/X11/xorg.conf
|
pankso@260
|
35 +++ /etc/X11/xorg.conf
|
pankso@415
|
36 @@ -26,6 +26,8 @@
|
pankso@415
|
37 Section "InputDevice"
|
pankso@415
|
38 Identifier "Keyboard0"
|
pankso@260
|
39 Driver "kbd"
|
pankso@260
|
40 + Option "XkbLayout" "ch"
|
pankso@260
|
41 + Option "XkbVariant" "fr"
|
pankso@260
|
42 EndSection
|
pankso@415
|
43
|
pankso@415
|
44 Section "InputDevice"
|
pankso@260
|
45 EOF
|
pankso@260
|
46 ;;
|
pankso@260
|
47 en)
|
pankso@260
|
48 # Englisk UK
|
pankso@260
|
49 patch -p0 <<EOF
|
pankso@260
|
50 --- /etc/X11/xorg.conf
|
pankso@260
|
51 +++ /etc/X11/xorg.conf
|
pankso@415
|
52 @@ -26,6 +26,8 @@
|
pankso@415
|
53 Section "InputDevice"
|
pankso@415
|
54 Identifier "Keyboard0"
|
pankso@260
|
55 Driver "kbd"
|
pankso@260
|
56 + Option "XkbLayout" "en"
|
pankso@260
|
57 + Option "XkbVariant" "en"
|
pankso@260
|
58 EndSection
|
pankso@415
|
59
|
pankso@415
|
60 Section "InputDevice"
|
pankso@260
|
61 EOF
|
pankso@260
|
62 ;;
|
pankso@260
|
63 ru)
|
pankso@260
|
64 # Russian
|
pankso@260
|
65 patch -p0 <<EOF
|
pankso@260
|
66 --- /etc/X11/xorg.conf
|
pankso@260
|
67 +++ /etc/X11/xorg.conf
|
pankso@415
|
68 @@ -26,6 +26,8 @@
|
pankso@260
|
69 Driver "kbd"
|
pankso@260
|
70 + Option "XkbLayout" "us,ru(winkeys)"
|
pankso@260
|
71 + Option "XkbVariant" "grp:alt_shift_toggle"
|
pankso@260
|
72 EndSection
|
pankso@415
|
73
|
pankso@415
|
74 Section "InputDevice"
|
pankso@260
|
75 EOF
|
pankso@260
|
76 ;;
|
pankso@303
|
77 slovene)
|
pankso@303
|
78 # Slovenian
|
pankso@303
|
79 patch -p0 <<EOF
|
pankso@303
|
80 --- /etc/X11/xorg.conf
|
pankso@303
|
81 +++ /etc/X11/xorg.conf
|
pankso@415
|
82 @@ -26,6 +26,8 @@
|
pankso@303
|
83 Driver "kbd"
|
pankso@303
|
84 + Option "XkbLayout" "si"
|
pankso@303
|
85 + Option "XkbOptions" "grp:alt_shift_toggle"
|
pankso@303
|
86 EndSection
|
pankso@415
|
87
|
pankso@415
|
88 Section "InputDevice"
|
pankso@303
|
89 EOF
|
pankso@308
|
90 ;;
|
pankso@260
|
91 *)
|
pankso@260
|
92 # Use clean /etc/keymap.conf value.
|
pankso@260
|
93 KEYMAP=${KEYMAP%-latin1}
|
pankso@260
|
94 KEYMAP=${KEYMAP%-lat2}
|
pankso@260
|
95 KEYMAP=${KEYMAP%-lat6}
|
pankso@260
|
96 KEYMAP=${KEYMAP%-abnt2}
|
pankso@260
|
97 patch -p0 <<EOF
|
pankso@260
|
98 --- /etc/X11/xorg.conf
|
pankso@260
|
99 +++ /etc/X11/xorg.conf
|
pankso@415
|
100 @@ -26,6 +26,8 @@
|
pankso@260
|
101 Driver "kbd"
|
pankso@260
|
102 + Option "XkbLayout" "$KEYMAP"
|
pankso@260
|
103 EndSection
|
pankso@415
|
104
|
pankso@415
|
105 Section "InputDevice"
|
pankso@260
|
106 EOF
|
pankso@260
|
107 ;;
|
pankso@260
|
108 esac
|
pankso@260
|
109 }
|
pankso@260
|
110
|
pankso@117
|
111 # Install xorg server
|
pankso@117
|
112 install_xorg()
|
pankso@117
|
113 {
|
pankso@117
|
114 tazpkg recharge
|
pankso@117
|
115 exec 3>&1
|
pankso@117
|
116 value=`$DIALOG --clear --colors --title " Install Xorg " \
|
pankso@117
|
117 --menu \
|
paul@334
|
118 "The 'tazx' application helps you to select your X driver." 16 70 5 \
|
pankso@117
|
119 $(grep xorg-xf86-video /var/lib/tazpkg/packages.list | cut -d- -f4 | while read x; do echo $x; echo driver; done) \
|
pankso@117
|
120 "quit" "Quitter" \
|
pankso@117
|
121 2>&1 1>&3`
|
pankso@117
|
122 retval=$?
|
pankso@117
|
123 exec 3>&-
|
pankso@117
|
124 # Continue, exit...
|
pankso@117
|
125 case $retval in
|
pankso@117
|
126 1)
|
pankso@117
|
127 echo "Cancel pressed..."
|
pankso@117
|
128 exit 0 ;;
|
pankso@117
|
129 255)
|
pankso@117
|
130 if test -z "$value"; then
|
pankso@117
|
131 echo "ESC pressed..."
|
pankso@117
|
132 exit 0
|
pankso@117
|
133 fi ;;
|
pankso@117
|
134 esac
|
pankso@117
|
135 # Set selected value.
|
pankso@117
|
136 case $value in
|
pankso@117
|
137 quit)
|
pankso@117
|
138 echo "Quit..."
|
pankso@117
|
139 exit 0 ;;
|
pankso@117
|
140 *)
|
pankso@117
|
141 tazpkg get-install xorg-server
|
pankso@117
|
142 tazpkg get-install xorg-xf86-video-$value
|
pascal@124
|
143 Xorg -configure :1
|
pankso@351
|
144 mv -f /root/xorg.conf.new /etc/X11/xorg.conf
|
pankso@260
|
145 patch_xorg_kbd
|
pankso@117
|
146 sed -i 's|/usr/bin/Xvesa|/usr/bin/Xorg|' /etc/slim.conf
|
pankso@117
|
147 sed -i s/"^xserver_arguments"/'\#xserver_arguments'/ /etc/slim.conf
|
pankso@351
|
148 XSERVER=Xorg ;;
|
pankso@117
|
149 esac
|
pankso@117
|
150 }
|
pankso@117
|
151
|
pankso@66
|
152 # Screen configuration dialog.
|
pankso@66
|
153 screen_config_dialog()
|
pankso@66
|
154 {
|
pankso@66
|
155 exec 3>&1
|
pankso@340
|
156 value=`$DIALOG \
|
pankso@66
|
157 --clear --colors \
|
pankso@66
|
158 --title " Configure X " \
|
pankso@66
|
159 --menu \
|
paul@334
|
160 "The 'tazx' application helps you to configure your X session.\n\
|
paul@334
|
161 Window Manager : \Z2$WM\Zn" 16 70 5 \
|
pankso@118
|
162 $(Xvesa -listmodes 2>&1 | grep ^0x | awk '{ printf "%s %s\n",$2,$3 }' | sort -nr | grep x[1-2][4-6]) \
|
pankso@66
|
163 "xterm" "800x600x16" \
|
pascal@386
|
164 "xorg" "Install Xorg" \
|
pascal@386
|
165 "text" "Disable X autostart" \
|
pankso@66
|
166 "quit" "Quitter" \
|
pankso@66
|
167 2>&1 1>&3`
|
pankso@66
|
168 retval=$?
|
pankso@66
|
169 exec 3>&-
|
pankso@66
|
170 # Continue, exit or help...
|
pankso@66
|
171 case $retval in
|
pankso@66
|
172 0)
|
pankso@66
|
173 continue ;;
|
pankso@66
|
174 1)
|
pankso@66
|
175 echo "Cancel pressed..."
|
pankso@66
|
176 exit 0 ;;
|
pankso@66
|
177 255)
|
pankso@66
|
178 if test -n "$value"; then
|
pankso@66
|
179 continue
|
pankso@66
|
180 else
|
pankso@66
|
181 echo "ESC pressed..."
|
pankso@66
|
182 exit 0
|
pankso@66
|
183 fi ;;
|
pankso@66
|
184 esac
|
pankso@66
|
185 # Set selected value.
|
pankso@66
|
186 case $value in
|
pankso@117
|
187 xorg)
|
pankso@339
|
188 install_xorg ;;
|
pankso@66
|
189 xterm)
|
pankso@66
|
190 Xvesa -ac -shadow -screen 800x600x16 -br &
|
pankso@66
|
191 exec xterm -cr orange -geometry 80x35+0-0 ;;
|
pascal@386
|
192 text)
|
pascal@386
|
193 sed -i s/'slim'/''/ /etc/rcS.conf
|
pascal@386
|
194 exit 0 ;;
|
pankso@66
|
195 *)
|
pankso@68
|
196 NEW_SCREEN=$value ;;
|
pankso@66
|
197 esac
|
pankso@66
|
198 }
|
pankso@4
|
199
|
pankso@65
|
200 # Slim config if root.
|
pankso@66
|
201 slim_config()
|
pankso@66
|
202 {
|
pankso@66
|
203 if test $(id -u) = 0; then
|
paul@317
|
204 # /etc/X11/screen.conf exists for Live mode, if this file does not
|
pankso@68
|
205 # exist tazx is executed at boot time.
|
pankso@68
|
206 mkdir -p /etc/X11
|
pankso@68
|
207 echo "SCREEN=$NEW_SCREEN" > /etc/X11/screen.conf
|
pankso@67
|
208 # Get current screen size and sed config file with the new value.
|
pankso@66
|
209 if [ -f /etc/slim.conf ]; then
|
pankso@351
|
210 RES=$(grep ^xserver_arguments /etc/slim.conf | \
|
pankso@351
|
211 sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
|
pankso@351
|
212 #sed -i "s/\(xserver_arguments.*-screen\).*/\1 $NEW_SCREEN/" /etc/slim.conf
|
pankso@351
|
213 sed -i s/"-screen $RES"/"-screen $NEW_SCREEN"/ /etc/slim.conf
|
pankso@66
|
214 fi
|
pankso@65
|
215 fi
|
pankso@66
|
216 }
|
pankso@66
|
217
|
pankso@339
|
218 # Window manager specific configuration.
|
pankso@339
|
219 wm_config()
|
pankso@66
|
220 {
|
pankso@339
|
221 case $WM in
|
pankso@339
|
222 ob|openbox)
|
pankso@339
|
223 WM=openbox-session
|
pankso@339
|
224 XSEVER_OPTS="dpms +extension Composite"
|
pankso@339
|
225 # Check if a personal autostart script exists if OB is installed.
|
pankso@339
|
226 if [ -d "/var/lib/tazpkg/installed/openbox" ]; then
|
pankso@339
|
227 if [ ! -f "$HOME/.config/openbox/autostart.sh" ]; then
|
pankso@339
|
228 mkdir -p $HOME/.config/openbox
|
pankso@339
|
229 cp /etc/xdg/openbox/autostart.sh $HOME/.config/openbox
|
pankso@339
|
230 fi
|
pankso@339
|
231 # Script for default user (uid=1000).
|
pankso@339
|
232 if [ ! -f "/home/$USER/.config/openbox/autostart.sh" ]; then
|
pankso@339
|
233 mkdir -p /home/$USER/.config/openbox
|
pankso@339
|
234 cp /etc/xdg/openbox/autostart.sh /home/$USER/.config/openbox
|
pankso@339
|
235 fi
|
pankso@339
|
236 if [ ! -f "/home/$USER/.config/openbox/menu.xml" ]; then
|
pankso@339
|
237 mkdir -p /home/$USER/.config/openbox
|
pankso@339
|
238 cp /etc/xdg/openbox/menu.xml /home/$USER/.config/openbox
|
pankso@339
|
239 fi
|
pankso@339
|
240 chown -R $USER.$USER /home/$USER/.config
|
pankso@339
|
241 fi ;;
|
pankso@339
|
242 jwm)
|
pankso@339
|
243 WM=jwm
|
pankso@339
|
244 XSEVER_OPTS="dpms +extension Composite"
|
pankso@339
|
245 JWM_CONFIG=$HOME/.jwmrc
|
pankso@339
|
246 if [ -d "/var/lib/tazpkg/installed/jwm" ]; then
|
pankso@339
|
247 if [ ! -f "$JWM_CONFIG" ]; then
|
pankso@339
|
248 cp /etc/jwm/system.jwmrc $JWM_CONFIG
|
pankso@339
|
249 fi
|
pankso@339
|
250 # In Live mode default user/root JWM config does not exist and
|
pankso@402
|
251 # $HOME is not set, this is because tazx is executed by boot
|
pankso@339
|
252 # scripts.
|
pankso@339
|
253 if [ ! -f "/home/$USER/.jwmrc" ]; then
|
pankso@339
|
254 cp /etc/jwm/system.jwmrc /home/$USER/.jwmrc
|
pankso@339
|
255 chown $USER.$USER /home/$USER/.jwmrc
|
pankso@339
|
256 fi
|
pankso@339
|
257 if [ ! -f "/root/.jwmrc" -a `id -u` = 0 ]; then
|
pankso@339
|
258 cp /etc/jwm/system.jwmrc /root/.jwmrc
|
pankso@339
|
259 fi
|
pankso@339
|
260 fi ;;
|
pankso@339
|
261 pekwm)
|
pankso@339
|
262 WM=pekwm
|
pankso@339
|
263 XSEVER_OPTS="dpms"
|
pankso@339
|
264 if [ -d "/var/lib/tazpkg/installed/pekwm" ]; then
|
pankso@339
|
265 if [ -d "$HOME/.pekwm" ]; then
|
pankso@339
|
266 cp -R /etc/pekwm $HOME/.pekwm
|
pankso@339
|
267 fi
|
pankso@339
|
268 # In Live mode we want config before starting pekwm the first time.
|
pankso@339
|
269 if [ ! -d "/home/$USER/.pekwm" ]; then
|
pankso@339
|
270 cp -R /etc/pekwm /home/$USER/.pekwm
|
pankso@339
|
271 chown -R $USER.$USER /home/$USER/.pekwm
|
pankso@339
|
272 chmod +x /home/$USER/.pekwm/start
|
pankso@339
|
273 fi
|
pankso@339
|
274 if [ ! -d "/root/.pekwm" -a `id -u` = 0 ]; then
|
pankso@339
|
275 cp -R /etc/pekwm /root/.pekwm
|
pankso@339
|
276 chmod +x /root/.pekwm/start
|
pankso@339
|
277 fi
|
pankso@339
|
278 fi ;;
|
pankso@339
|
279 e17|enlightenment)
|
pankso@339
|
280 WM=enlightenment_start
|
pankso@339
|
281 XSEVER_OPTS="dpms -terminate" ;;
|
pankso@339
|
282 fluxbox)
|
pankso@339
|
283 WM=startfluxbox
|
pankso@339
|
284 XSEVER_OPTS="dpms" ;;
|
pankso@339
|
285 dwm|karmen)
|
pankso@339
|
286 WM=$WM-session
|
pankso@339
|
287 XSEVER_OPTS="dpms" ;;
|
pankso@339
|
288 awesome)
|
pankso@339
|
289 WM=awesome
|
pankso@339
|
290 XSEVER_OPTS="dpms" ;;
|
erjo@396
|
291 xfce|xfce4)
|
erjo@396
|
292 WM=xfce4-session
|
erjo@396
|
293 XSEVER_OPTS="dpms -terminate" ;;
|
pankso@339
|
294 esac
|
pankso@81
|
295 }
|
pankso@81
|
296
|
pankso@68
|
297 # Sample xinitrc for user (WM can be specified with F1 at slim login).
|
pankso@68
|
298 xinitrc_sample()
|
pankso@68
|
299 {
|
pankso@68
|
300 cat > $FILE << "EOF"
|
pankso@68
|
301 # ~/.xinitrc: Executed by slim login manager to startx X session.
|
pankso@339
|
302 # You can use F1 with Slim to chage your window manager or configure
|
pankso@339
|
303 # it permanently with your personnal applications.conf file.
|
pankso@68
|
304 #
|
pankso@339
|
305 . $HOME/.config/slitaz/applications.conf
|
pankso@99
|
306
|
pankso@117
|
307 case $1 in
|
pankso@339
|
308 e17|enlightenment*)
|
pankso@315
|
309 exec enlightenment_start ;;
|
pankso@162
|
310 openbox|openbox-session|ob)
|
pankso@315
|
311 exec openbox-session ;;
|
pankso@315
|
312 dwm|dwm-session)
|
pankso@315
|
313 exec dwm-session ;;
|
pankso@339
|
314 fluxbox|startfluxbox)
|
pankso@339
|
315 exec startfluxbox ;;
|
pankso@339
|
316 awesome)
|
pankso@339
|
317 exec awesome ;;
|
pankso@339
|
318 pekwm)
|
pankso@339
|
319 exec pekwm ;;
|
pankso@339
|
320 karmen|karmen-session)
|
pankso@339
|
321 exec karmen-session ;;
|
pankso@117
|
322 jwm)
|
pankso@81
|
323 lxpanel &
|
pankso@315
|
324 exec jwm ;;
|
erjo@396
|
325 xfce|xfce4|xfce4-session)
|
erjo@396
|
326 xfce4-session ;;
|
pankso@117
|
327 *)
|
pankso@339
|
328 exec $WINDOW_MANAGER ;;
|
pankso@68
|
329 esac
|
pankso@68
|
330 EOF
|
pankso@339
|
331 # Set default WM in applications.conf user file. Default WM can be
|
pankso@339
|
332 # configured graphicaly with 'desktopbox tazapps'
|
pankso@339
|
333 . $CONFIG
|
pankso@339
|
334 sed -i s/"WINDOW_MANAGER=.*"/"WINDOW_MANAGER=\"$WM\""/ \
|
pankso@339
|
335 $CONFIG
|
pankso@68
|
336 }
|
pankso@68
|
337
|
pankso@65
|
338 # ~/.xinitrc for slim login.
|
pankso@66
|
339 creat_xinitrc()
|
pankso@66
|
340 {
|
pankso@68
|
341 FILE=$HOME/.xinitrc
|
pankso@339
|
342 CONFIG=$HOME/.config/slitaz/applications.conf
|
pankso@339
|
343 if [ ! -f $CONFIG ]; then
|
pankso@339
|
344 mkdir -p $HOME/.config/slitaz
|
pankso@339
|
345 cp /etc/slitaz/applications.conf $CONFIG
|
pankso@339
|
346 fi
|
pankso@68
|
347 xinitrc_sample
|
pankso@209
|
348 # In Live mode default user needs a xinitrc, since tazx
|
pankso@68
|
349 # is executed only by root.
|
pankso@209
|
350 if [ ! -f /home/$USER/.xinitrc ]; then
|
pankso@209
|
351 FILE=/home/$USER/.xinitrc
|
pankso@339
|
352 CONFIG=/home/$USER/.config/slitaz/applications.conf
|
pankso@339
|
353 if [ ! -f $CONFIG ]; then
|
pankso@339
|
354 mkdir -p /home/$USER/.config/slitaz
|
pankso@339
|
355 cp /etc/slitaz/applications.conf $CONFIG
|
pankso@339
|
356 fi
|
pankso@68
|
357 xinitrc_sample
|
pankso@209
|
358 chown $USER.$USER $FILE
|
pankso@339
|
359 chown -R $USER.$USER /home/$USER/.config/slitaz
|
pankso@105
|
360 fi
|
pankso@66
|
361 }
|
pankso@45
|
362
|
MikeDSmith25@252
|
363 # Create ~/.xsession to keep the configuration selected (used
|
MikeDSmith25@252
|
364 # only by startx, Slim login manager uses .xinitrc).
|
pankso@66
|
365 creat_xsession()
|
pankso@66
|
366 {
|
pankso@68
|
367 cat > $HOME/.xsession << _EOF_
|
pankso@68
|
368 # ~/.xsession: Start X window session manually on your system (startx).
|
pankso@37
|
369 #
|
pankso@68
|
370 _EOF_
|
pankso@117
|
371 if [ "$XSERVER " == "Xorg" ]; then
|
pankso@117
|
372 echo 'Xorg &' >> $HOME/.xsession
|
pankso@117
|
373 else
|
pankso@351
|
374 cat >> $HOME/.xsession << _EOT_
|
pankso@351
|
375 $XSERVER -ac -shadow $XSEVER_OPTS \\
|
pankso@351
|
376 -screen $NEW_SCREEN \\
|
pankso@351
|
377 -keybd $KEYBD \\
|
pankso@351
|
378 -mouse $MOUSE &
|
pankso@351
|
379 _EOT_
|
pankso@117
|
380 fi
|
pankso@117
|
381 echo '#xterm &' >> $HOME/.xsession
|
pankso@117
|
382 echo '#xpad &' >> $HOME/.xsession
|
pankso@99
|
383 # LXpanel by default with JWM.
|
pankso@117
|
384 if [ "$WM" = "jwm" ]; then
|
pankso@99
|
385 echo 'lxpanel &' >> $HOME/.xsession
|
pankso@99
|
386 fi
|
pankso@104
|
387 echo "exec $WM" >> $HOME/.xsession
|
pankso@66
|
388 chmod 700 $HOME/.xsession
|
pankso@66
|
389 }
|
pankso@4
|
390
|
pankso@66
|
391 ###################
|
pankso@66
|
392 # Tazx sequence #
|
pankso@66
|
393 ###################
|
pankso@66
|
394
|
pankso@351
|
395 case "$1" in
|
pankso@351
|
396 show-config)
|
pankso@351
|
397 . /etc/X11/screen.conf
|
pankso@351
|
398 echo ""
|
pankso@351
|
399 echo "X11 screen resolution: $SCREEN"
|
pankso@351
|
400 echo ""
|
pankso@351
|
401 echo "Slim configuration for X server:"
|
pankso@351
|
402 cat /etc/slim.conf | grep ^default_xserver
|
pankso@351
|
403 cat /etc/slim.conf | grep ^xserver_arguments
|
pankso@351
|
404 echo "" ;;
|
pankso@351
|
405 install-xorg)
|
pankso@351
|
406 # WM can be specified on cmdline.
|
pankso@351
|
407 if [ -n "$2" ]; then
|
pankso@402
|
408 WM=$2
|
pankso@351
|
409 fi
|
pankso@351
|
410 install_xorg
|
pankso@351
|
411 slim_config
|
pankso@351
|
412 wm_config
|
pankso@351
|
413 creat_xinitrc
|
pankso@351
|
414 creat_xsession ;;
|
pankso@415
|
415 config-xorg)
|
pankso@415
|
416 # WM can be specified on cmdline.
|
pankso@415
|
417 if [ -n "$2" ]; then
|
pankso@415
|
418 WM=$2
|
pankso@415
|
419 fi
|
pankso@415
|
420 XSERVER="Xorg"
|
pankso@415
|
421 wm_config
|
pankso@415
|
422 creat_xinitrc
|
pankso@415
|
423 creat_xsession
|
pankso@415
|
424 patch_xorg_kbd ;;
|
pankso@351
|
425 *)
|
pankso@351
|
426 # WM can be specified on cmdline.
|
pankso@351
|
427 if [ -n "$1" ]; then
|
pankso@402
|
428 WM=$1
|
pankso@351
|
429 fi
|
pankso@351
|
430 [ -n "$NEW_SCREEN" ] || screen_config_dialog
|
pankso@351
|
431 slim_config
|
pankso@351
|
432 wm_config
|
pankso@351
|
433 creat_xinitrc
|
pankso@351
|
434 creat_xsession ;;
|
pankso@351
|
435 esac
|
pankso@4
|
436
|
pankso@4
|
437 exit 0
|