]>
Commit | Line | Data |
---|---|---|
4747f11d JB |
1 | --- WindowMaker-0.80.2/util/wmchlocale.in.orig Tue Jul 24 01:13:24 2001 |
2 | +++ WindowMaker-0.80.2/util/wmchlocale.in Sat Nov 23 14:26:30 2002 | |
3 | @@ -52,7 +52,7 @@ | |
4 | test="--test";; | |
5 | *) | |
6 | if [ -z "$new_locale" ]; then | |
7 | - new_locale="$i" | |
8 | + new_locale="${i%_*}" | |
9 | else | |
10 | echo -e "\nUnrecognized command line argument, run without arguments to see help.\n" | |
11 | exit 1 | |
12 | @@ -65,7 +65,7 @@ | |
13 | fi | |
14 | ||
15 | if [ -n "$auto" ] && [ -z "$new_locale" ]; then | |
16 | - new_locale=$LANG | |
17 | + new_locale=${LANG%_*} | |
18 | if [ -z "$new_locale" ]; then | |
19 | new_locale="${LC_ALL%_*}" | |
20 | fi | |
21 | @@ -75,7 +75,7 @@ | |
22 | if [ -z "$default" ]; then | |
23 | echo -e "\nNo locale is set, using default...\n" >/dev/stderr | |
24 | fi | |
25 | -elif ! (locale -a |grep "^$new_locale$" &>/dev/null); then | |
26 | +elif ! (locale -a |grep "^$new_locale$" >/dev/null 2>/dev/null); then | |
27 | if [ -z "$auto" ]; then | |
28 | echo -e "\n"\ | |
29 | "Locale $new_locale is not supported on your system..."\ | |
30 | @@ -86,7 +86,7 @@ | |
31 | "Check your LANG and LC_ALL variables or install your locale support\n"\ | |
32 | "\n" >/dev/stderr | |
33 | fi | |
34 | - exit 1 | |
35 | +# exit 1 -- disabled, `locale -a` doesn't work under glibc 2.3.1 | |
36 | fi | |
37 | ||
38 | echo -n "Setting Window Maker root menu... " | |
39 | @@ -104,7 +104,7 @@ | |
40 | for new_menu in $menu_list; do | |
41 | for wm_dir in $LOCALDIR $GLOBALDIR; do | |
42 | if [ -f "$wm_dir/$new_menu" ]; then | |
43 | - if [ -z "$new_locale" ] || ( [ -n "$new_locale" ] && echo "$new_menu" |grep "menu.$new_locale" &>/dev/null ); then | |
44 | + if [ -z "$new_locale" ] || ( [ -n "$new_locale" ] && echo "$new_menu" |grep "menu.$new_locale" >/dev/null 2>/dev/null); then | |
45 | echo "success" | |
46 | else | |
47 | echo "fail (copying default)" | |
48 | @@ -135,11 +135,11 @@ | |
49 | else | |
50 | args="--locale=$new_locale $nodef" | |
51 | fi | |
52 | -if wsetfont "$args" &>/dev/null; then | |
53 | +if wsetfont "$args" >/dev/null 2>/dev/null; then | |
54 | echo "success" | |
55 | else | |
56 | echo -n "fail" | |
57 | - if wsetfont default "$test" &>/dev/null; then | |
58 | + if wsetfont default "$test" >/dev/null 2>/dev/null; then | |
59 | echo " (setting default)" | |
60 | else | |
61 | echo " (totally)" |