Author: branden
Date: 2006-08-01 12:43:16 -0400 (Tue, 01 Aug 2006)
New Revision: 2620
Modified:
branches/7.1/app/xterm/debian/changelog
branches/7.1/app/xterm/debian/local/koi8rxterm
Log:
Resync koi8rxterm script with recent upstream changes to uxterm, upon
which it is based.
Set svn:keywords property to "Id" on koi8rxterm script.
Modified: branches/7.1/app/xterm/debian/changelog
===================================================================
--- branches/7.1/app/xterm/debian/changelog 2006-08-01 16:40:17 UTC (rev
2619)
+++ branches/7.1/app/xterm/debian/changelog 2006-08-01 16:43:16 UTC (rev
2620)
@@ -6,8 +6,10 @@
easily viewable in a terminal with "groff -Tutf8 ctlseqs.ms | more", so it
seems useful.) (Closes: #301173)
* Update copy of XTerm FAQ to revision 1.90 (dated 2005-11-02).
+ * Resync koi8rxterm script with recent upstream changes to uxterm, upon
+ which it is based.
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 1 Aug 2006 12:39:17 -0400
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 1 Aug 2006 12:42:13 -0400
xterm (210-3) unstable; urgency=low
Modified: branches/7.1/app/xterm/debian/local/koi8rxterm
===================================================================
--- branches/7.1/app/xterm/debian/local/koi8rxterm 2006-08-01 16:40:17 UTC
(rev 2619)
+++ branches/7.1/app/xterm/debian/local/koi8rxterm 2006-08-01 16:43:16 UTC
(rev 2620)
@@ -1,10 +1,14 @@
#!/bin/sh
-# $Id: koi8rxterm 189 2005-06-11 00:04:27Z branden $
+# $Id$
# This is a wrapper script to set up xterm with a KOI8-R locale; based on
# uxterm, by Thomas Dickey.
-program=xterm
-locale=`(LC_ALL=C LC_CTYPE=C LANG=C locale >/dev/null) 2>&1`
+: ${XTERM_PROGRAM=xterm}
+
+# Check if there is a workable locale program. If there is not, we will read
+# something via the standard error. Ignore whatever is written to the
+# standard output.
+locale=`sh -c "LC_ALL=C LC_CTYPE=C LANG=C locale >/dev/null" 2>&1`
found=no
# Check for -version and -help options, to provide a simple return without
@@ -13,7 +17,7 @@
then
case $1 in
-v|-ver*|-h|-he*)
- $program "$@"
+ $XTERM_PROGRAM "$@"
exit $?
;;
esac
@@ -53,20 +57,29 @@
name="LC_CTYPE"
value="ru_RU.KOI8-R"
fi
+ eval save=\$${name}
eval ${name}=${value}
eval export ${name}
if test -z "$locale" ; then
# The 'locale' program tries to do a sanity check.
- check=`(locale >/dev/null) 2>&1`
+ check=`sh -c "locale >/dev/null" 2>&1`
if test -n "$check" ; then
- echo "koi8rxterm tried to use locale $value" >&2
- echo "$check" >&2
+ eval ${name}=${save}
+ eval export ${name}
+
+ echo "koi8rxterm tried to use locale $value by setting
\$$name" >&2
+ xmessage -file - <<EOF
+koi8rxterm tried unsuccessfully to use locale $value
+by setting \$$name to "${value}".
+EOF
exit 1
fi
fi
fi
# for testing:
-#test -f ./xterm && program=./xterm
+#test -f ./xterm && XTERM_PROGRAM=./xterm
-exec $program -class KOI8RXTerm -title 'koi8rxterm' -k8 "$@"
+exec $XTERM_PROGRAM -class KOI8RXTerm -title 'koi8rxterm' -k8 "$@"
+
+# vim:set ai noet sw=8 ts=8 tw=80:
Property changes on: branches/7.1/app/xterm/debian/local/koi8rxterm
___________________________________________________________________
Name: svn:keywords
+ Id
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
