slitaz-tools rev 610
tazbox: Add setup box from Claudinei (all in one box for kmap, locale and TZ)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu Jun 02 18:14:26 2011 +0200 (2011-06-02) |
parents | 2c9bd787c7f6 |
children | cbcf80d8f028 |
files | Makefile tazbox/tazbox |
line diff
1.1 --- a/Makefile Wed Jun 01 21:11:11 2011 +0200 1.2 +++ b/Makefile Thu Jun 02 18:14:26 2011 +0200 1.3 @@ -76,7 +76,7 @@ 1.4 touch $(DESTDIR)/$$file; \ 1.5 done; 1.6 # /usr/bin tools. 1.7 - for app in startx history tazdialog editor browser terminal file-manager; \ 1.8 + for app in tazx startx history tazdialog editor browser terminal file-manager; \ 1.9 do \ 1.10 install -m 0755 tinyutils/$$app $(DESTDIR)$(PREFIX)/bin; \ 1.11 done; 1.12 @@ -112,7 +112,8 @@ 1.13 for l in $(LINGUAS); \ 1.14 do \ 1.15 install -m 0777 -d $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ 1.16 - install po/mo/$$l/* $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ 1.17 + install -m 0644 po/mo/$$l/* \ 1.18 + $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ 1.19 done; 1.20 # Default English messages (will move to po) 1.21 install -m 0777 -d $(DESTDIR)$(PREFIX)/share/slitaz/messages/en
2.1 --- a/tazbox/tazbox Wed Jun 01 21:11:11 2011 +0200 2.2 +++ b/tazbox/tazbox Thu Jun 02 18:14:26 2011 +0200 2.3 @@ -38,6 +38,7 @@ 2.4 locale $(gettext "Configure system language (root)") 2.5 keymap $(gettext "Configure system keymap (root)") 2.6 tz $(gettext "Configure system timezone (root)") 2.7 + setup $(gettext "System initial setup (locale, keymap & timezone)") 2.8 2.9 EOT 2.10 } 2.11 @@ -88,6 +89,49 @@ 2.12 "`gettext \"Shutdown system\"` : halt" 2.13 } 2.14 2.15 +# Generate keymap list 2.16 +gen_kmap_list() { 2.17 + tmp=/tmp/keymap.list 2.18 + echo > $tmp 2.19 + cd /usr/share/kbd/keymaps/i386 2.20 + # We first need a list to sort and then use \n for Yad list. 2.21 + for i in $(find *rty *rtz dvorak -name *.map.gz) 2.22 + do 2.23 + keymap=$(basename $i) 2.24 + type=$(dirname $i) 2.25 + echo -e "$keymap|$type" >> $tmp 2.26 + done 2.27 +} 2.28 + 2.29 +# Initial Config functions 2.30 +setup_main() { 2.31 + gen_kmap_list 2.32 + db="/usr/share/i18n/locales" 2.33 + tmp="/tmp/keymap.list" 2.34 + zi="/usr/share/zoneinfo/" 2.35 + title=$(gettext "SliTaz Initial Setup") 2.36 + message=$(gettext "\n<big>Here you can set your preferences\nfor <b>locale, keymap and timezone</b></big>\n\n") 2.37 + locale=$(ls -1 $db | grep ^[a-z][a-z]_[A-Z][A-Z] | tr "\n" "!") 2.38 + keymap=$(cat $tmp | cut -d. -f1 | sort | tr "\n" "!") 2.39 + timezone=$(find $zi -type f | sed s,$zi,,g | tr "\n" "!") 2.40 + yad --width=500 --height=380 \ 2.41 + --image=$icon --title="$title" --form --text="$message" \ 2.42 + --field "Locale:CB" \ 2.43 + --field "Keymap:CB" \ 2.44 + --field "Timezone:CB" \ 2.45 + $locale \ $keymap \ $timezone 2.46 +} 2.47 + 2.48 +setup() { 2.49 + choices=$(setup_main) 2.50 + locale=$(echo $choices | cut -d"|" -f1) 2.51 + keymap=$(echo $choices | cut -d"|" -f2) 2.52 + timezone=$(echo $choices | cut -d"|" -f3) 2.53 + [ $locale ] && tazlocale init $locale 2.54 + [ $keymap ] && tazkeymap init $keymap 2.55 + [ $timezone ] && echo $timezone > /etc/TZ 2.56 +} 2.57 + 2.58 # Locale functions 2.59 locale_main() { 2.60 text=$(gettext "Language configuration") 2.61 @@ -118,17 +162,9 @@ 2.62 2.63 # Keymap functions 2.64 keymap_main() { 2.65 + gen_kmap_list 2.66 text=$(gettext "Keyboard configuration") 2.67 tmp=/tmp/keymap.list 2.68 - echo > $tmp 2.69 - cd /usr/share/kbd/keymaps/i386 2.70 - # We first need a list to sort and then use \n for Yad list. 2.71 - for i in $(find *rty *rtz dvorak -name *.map.gz) 2.72 - do 2.73 - keymap=$(basename $i) 2.74 - type=$(dirname $i) 2.75 - echo -e "$keymap|$type" >> $tmp 2.76 - done 2.77 for i in $(sort $tmp) 2.78 do 2.79 keymap=$(echo $i | cut -d "|" -f 1) 2.80 @@ -239,8 +275,10 @@ 2.81 locale ;; 2.82 keymap) 2.83 keymap ;; 2.84 - tz) 2.85 - tz ;; 2.86 + tz) 2.87 + tz ;; 2.88 + setup) 2.89 + setup ;; 2.90 boot) 2.91 # This command is used at first boot to configure system. 2.92 Xorg -br -quiet -nolisten tcp :1 &