From aa775d8b406153b58b1c0bac1abbca322bba6bc4 Mon Sep 17 00:00:00 2001 From: alanh Date: Tue, 9 Oct 2001 09:51:17 +0000 Subject: fix make install problem using InstallScript(). --- programs/xterm/uxterm | 44 -------------------------------------------- programs/xterm/uxterm.script | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100755 programs/xterm/uxterm create mode 100755 programs/xterm/uxterm.script diff --git a/programs/xterm/uxterm b/programs/xterm/uxterm deleted file mode 100755 index 743541086..000000000 --- a/programs/xterm/uxterm +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# $XFree86$ -# wrapper script to setup xterm with UTF-8 locale - -program=xterm -found=no - -# Check environment variables that xterm does, in the same order: -for name in LC_ALL LC_CTYPE LANG -do - eval 'value=$'$name - if test -n "$value" ; then - case $value in - *.UTF-8) - found=yes - ;; - C|POSIX) - # Yes, I know this is not the same - but why are you - # here then? - value=en_US - ;; - esac - break - fi -done - -# If we didn't find one that used UTF-8, modify the safest one. Not everyone -# has a UTF-8 locale installed (and there appears to be no trivial/portable way -# to determine whether it is, from a shell script). We could check if the -# user's shell does not reset unknown locale specifiers, but not all shells do. -if test $found != yes ; then - if test -n "$value" ; then - eval ${name}=${value}.UTF-8 - eval export ${name} - else - LC_CTYPE=en_US.UTF-8 - export LC_CTYPE - fi -fi - -# for testing: -#test -f ./xterm && program=./xterm - -$program -class UXTerm -title 'uxterm' -u8 "$@" diff --git a/programs/xterm/uxterm.script b/programs/xterm/uxterm.script new file mode 100755 index 000000000..8beb433a4 --- /dev/null +++ b/programs/xterm/uxterm.script @@ -0,0 +1,44 @@ +#!/bin/sh +# $XFree86: xc/programs/xterm/uxterm,v 1.1 2001/10/08 01:08:10 dickey Exp $ +# wrapper script to setup xterm with UTF-8 locale + +program=xterm +found=no + +# Check environment variables that xterm does, in the same order: +for name in LC_ALL LC_CTYPE LANG +do + eval 'value=$'$name + if test -n "$value" ; then + case $value in + *.UTF-8) + found=yes + ;; + C|POSIX) + # Yes, I know this is not the same - but why are you + # here then? + value=en_US + ;; + esac + break + fi +done + +# If we didn't find one that used UTF-8, modify the safest one. Not everyone +# has a UTF-8 locale installed (and there appears to be no trivial/portable way +# to determine whether it is, from a shell script). We could check if the +# user's shell does not reset unknown locale specifiers, but not all shells do. +if test $found != yes ; then + if test -n "$value" ; then + eval ${name}=${value}.UTF-8 + eval export ${name} + else + LC_CTYPE=en_US.UTF-8 + export LC_CTYPE + fi +fi + +# for testing: +#test -f ./xterm && program=./xterm + +$program -class UXTerm -title 'uxterm' -u8 "$@" -- cgit v1.2.3