diff options
Diffstat (limited to 'source/x')
| -rw-r--r-- | source/x/xterm/doinst.sh | 14 | ||||
| -rw-r--r-- | source/x/xterm/linux-console-xterm.ad | 8 | ||||
| -rwxr-xr-x | source/x/xterm/xterm.SlackBuild | 11 |
3 files changed, 26 insertions, 7 deletions
diff --git a/source/x/xterm/doinst.sh b/source/x/xterm/doinst.sh index 1f8ff67de..7f08ab7d0 100644 --- a/source/x/xterm/doinst.sh +++ b/source/x/xterm/doinst.sh @@ -1,3 +1,17 @@ +#!/bin/sh +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config etc/X11/app-defaults/XTerm.new + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad index 3f43b91db..8b1eddadd 100644 --- a/source/x/xterm/linux-console-xterm.ad +++ b/source/x/xterm/linux-console-xterm.ad @@ -4,8 +4,12 @@ ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -XTerm.termName: xterm-new -! Use the more featureful 'xterm-new' terminfo entry. +! Choose one below: +!XTerm.termName: xterm-new +!! Use the more featureful 'xterm-new' terminfo entry. +XTerm.termName: xterm +! Use the standard 'xterm' terminfo entry. + XTerm.locale: true ! Enable conversion between the locale and utf-8 if necessary. !XTerm.ptyInitialErase: false diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild index 75eb0642c..fcc52f60a 100755 --- a/source/x/xterm/xterm.SlackBuild +++ b/source/x/xterm/xterm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xterm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -113,10 +113,11 @@ cp xterm.desktop uxterm.desktop $PKG/usr/share/applications # Install a default XTerm app-defaults that looks like the Linux console. # Thanks to GazL. -mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default -cp -a $CWD/linux-console-xterm.ad $PKG/etc/X11/app-defaults/XTerm -chown root:root $PKG/etc/X11/app-defaults/XTerm -chmod 644 $PKG/etc/X11/app-defaults/XTerm +cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default +echo >> $PKG/etc/X11/app-defaults/XTerm +cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm +touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm +mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ |