slitaz-tools rev 922 5.8.13
fix "tazx auto" sed error with unicode locale
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Fri Nov 14 23:22:55 2014 +0200 (2014-11-14) |
parents | d5a123004119 |
children | 86a2c7735907 |
files | po/slitaz-tools/ru.po tinyutils/tazx |
line diff
1.1 --- a/po/slitaz-tools/ru.po Fri Nov 14 21:53:46 2014 +0000 1.2 +++ b/po/slitaz-tools/ru.po Fri Nov 14 23:22:55 2014 +0200 1.3 @@ -119,7 +119,7 @@ 1.4 1.5 #: tinyutils/tazx:154 tinyutils/hwsetup:258 1.6 msgid "Auto configuring Xorg..." 1.7 -msgstr "Авто-настройка X.Org…" 1.8 +msgstr "Авто-настройка Xorg…" 1.9 1.10 #: tinyutils/tazx:156 tinyutils/tazx:184 1.11 msgid "driver"
2.1 --- a/tinyutils/tazx Fri Nov 14 21:53:46 2014 +0000 2.2 +++ b/tinyutils/tazx Fri Nov 14 23:22:55 2014 +0200 2.3 @@ -172,7 +172,7 @@ 2.4 autoselect_driver() { 2.5 inst_pkg pciutils 2.6 for v in AMD ATI Intel NVIDIA SiS VMware; do 2.7 - hw=$(echo $(lspci | grep VGA | grep $v | sed s/[^aA-zZ]//g)--) 2.8 + hw=$(echo $(lspci | grep VGA | grep $v |LC_ALL=C sed 's/[^aA-zZ]//g')--) 2.9 if [ ! $hw = -- ]; then case $v in 2.10 AMD|ATI)d=ati;; 2.11 Intel) d=intel;; 2.12 @@ -189,7 +189,7 @@ 2.13 } 2.14 2.15 inst_pkg() { 2.16 - pkg="$@" && colorize 5 $(_ 'Installing pkg: $pkg') 2.17 + pkg="$@" && colorize 3 $(_ 'Installing pkg: $pkg') 2.18 CMD="sudo tazpkg -gi $@" 2.19 test $(id -u) = 0 && CMD="tazpkg -gi $@" 2.20 [ -d "$installed/$@" ] || $CMD