wok diff slitaz-i18n/stuff/locale-pack.functions @ rev 18838
Up gparted (0.25.0)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Jan 21 11:45:04 2016 +0100 (2016-01-21) |
parents | cea5a9fa7152 |
children | 0b07c031c9db |
line diff
1.1 --- a/slitaz-i18n/stuff/locale-pack.functions Fri Nov 28 01:22:40 2014 +0200 1.2 +++ b/slitaz-i18n/stuff/locale-pack.functions Thu Jan 21 11:45:04 2016 +0100 1.3 @@ -1,13 +1,13 @@ 1.4 get_locale() 1.5 { 1.6 - [ "x$CHARMAP" == x ] && CHARMAP=UTF-8 1.7 + [ -z "$CHARMAP" ] && CHARMAP='UTF-8' 1.8 1.9 case "$SLITAZ_ARCH" in 1.10 arm*) ;; 1.11 i?86) 1.12 # Get translated Openbox menu from SliTaz sub project slitaz-configs 1.13 - obmenu=$WOK/slitaz-configs/install/etc/xdg/openbox/menu.$LOCALE.xml 1.14 - if [ -f $obmenu ]; then 1.15 + obmenu="$WOK/slitaz-configs/install/etc/xdg/openbox/menu.$LOCALE.xml" 1.16 + if [ -f "$obmenu" ]; then 1.17 mkdir -p $fs/etc/xdg/openbox 1.18 echo "* Found $LOCALE translations for: openbox menu" 1.19 cp $obmenu $fs/etc/xdg/openbox 1.20 @@ -21,8 +21,8 @@ 1.21 esac 1.22 mkdir -p $fs/usr/share/locale/$LOCALE 1.23 for app in $CORE_PKGS; do 1.24 - app_locale=$WOK/$app/install/usr/share/locale/$LOCALE 1.25 - if [ -d $app_locale ]; then 1.26 + app_locale="$WOK/$app/install/usr/share/locale/$LOCALE" 1.27 + if [ -d "$app_locale" ]; then 1.28 echo "* Found $LOCALE translations for: $app" 1.29 cp -a $app_locale $fs/usr/share/locale 1.30 fi 1.31 @@ -31,27 +31,34 @@ 1.32 # List of available locales 1.33 cd $WOK/glibc/install/usr/share/i18n/locales 1.34 locales=$(ls -1 | sed -n '/^'$LOCALE'$/p; /^'$LOCALE'_.*/p' | sed '/translit/d') 1.35 - [ "x$LOCALEDEF" != x ] && locales=$LOCALEDEF 1.36 + [ -n "$LOCALEDEF" ] && locales="$LOCALEDEF" 1.37 1.38 # Get X11 locale 1.39 for def in $locales; do 1.40 - x11_locale=$WOK/xorg-libX11/install/usr/share/X11/locale/$def.$CHARMAP 1.41 - if [ -d $x11_locale ]; then 1.42 - echo "* Found $def.$CHARMAP locale for: X11" 1.43 - mkdir -p $fs/usr/share/X11/locale 1.44 - cp -a $x11_locale $fs/usr/share/X11/locale 1.45 - fi 1.46 + x11_locale="$WOK/xorg-libX11/install/usr/share/X11/locale/$def.$CHARMAP" 1.47 + case "$def.$CHARMAP" in 1.48 + en_US.UTF-8) 1.49 + # belongs to "xorg-libX11" package, skip it 1.50 + ;; 1.51 + *) 1.52 + if [ -d "$x11_locale" ]; then 1.53 + echo "* Found $def.$CHARMAP locale for: X11" 1.54 + mkdir -p $fs/usr/share/X11/locale 1.55 + cp -a $x11_locale $fs/usr/share/X11/locale 1.56 + fi 1.57 + ;; 1.58 + esac 1.59 done 1.60 1.61 # Get locale definition files 1.62 - usil=usr/share/i18n/locales 1.63 + usil='usr/share/i18n/locales' 1.64 for def in $locales; do 1.65 echo "* Copying $def locale files" 1.66 mkdir -p $fs/$usil 1.67 cp -a $WOK/glibc/install/$usil/$def $fs/$usil 1.68 done 1.69 1.70 - if [ "x$LOCALE_DEPENDS" != x ]; then 1.71 + if [ -n "$LOCALE_DEPENDS" ]; then 1.72 for dep in $LOCALE_DEPENDS; do 1.73 echo "* Copying additional $dep locale files" 1.74 cp -a $WOK/glibc/install/usr/share/i18n/locales/$dep \ 1.75 @@ -59,6 +66,8 @@ 1.76 done 1.77 fi 1.78 1.79 + #grep -r 'include' $fs/usr/share/i18n/locales # test includes in locales 1.80 + 1.81 # Get timezones from tzdata 1.82 countries=$(echo $locales | \ 1.83 sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u) 1.84 @@ -82,7 +91,7 @@ 1.85 1.86 # Get country flags 1.87 echo "* Copy flag icons for countries: "$countries 1.88 - usih=usr/share/icons/hicolor 1.89 + usih='usr/share/icons/hicolor' 1.90 for country in $countries; do 1.91 for size in 16x16 48x48; do 1.92 install -Dm644 \ 1.93 @@ -91,22 +100,37 @@ 1.94 done 1.95 done 1.96 # above icons credits 1.97 - fusl=$fs/usr/share/licenses 1.98 + fusl="$fs/usr/share/licenses" 1.99 mkdir -p $fusl 1.100 cp -a $WOK/flag-icons/source/*/LICENSE.txt $fusl/gosquared.txt 1.101 1.102 # Gconv modules for encodings other than default 1.103 - if [ "x$GCONV" != x ]; then 1.104 + if [ -n "$GCONV" ]; then 1.105 mkdir -p $fs/usr/lib/gconv 1.106 for enc in $GCONV; do 1.107 echo "* Copying $enc gconv module" 1.108 cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv 1.109 done 1.110 + #ldd $fs/usr/lib/gconv/* # test depends in gconv modules 1.111 + fi 1.112 + 1.113 + # Console keyboard layouts 1.114 + if [ -n "$KBD" ]; then 1.115 + uskki='usr/share/kbd/keymaps/i386' 1.116 + cd $WOK/kbd/install 1.117 + for map in $KBD; do 1.118 + echo "* Copying $map kbd map" 1.119 + mapfiles=$(find . -type f -name $map.map.gz) 1.120 + for mapfile in $mapfiles; do 1.121 + mkdir -p "$fs/$(dirname "${mapfile#./}")" 1.122 + cp "$WOK/kbd/install/${mapfile#./}" "$fs/${mapfile#./}" 1.123 + done 1.124 + done 1.125 fi 1.126 1.127 # Keyboard flags for default lxpanel keyboard applet 1.128 - if [ "x$KB_FLAGS" != x ]; then 1.129 - uslix=usr/share/lxpanel/images/xkb-flags 1.130 + if [ -n "$KB_FLAGS" ]; then 1.131 + uslix='usr/share/lxpanel/images/xkb-flags' 1.132 mkdir -p $fs/$uslix 1.133 for i in $KB_FLAGS; do 1.134 install -Dm644 \