sane default for terminfo

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@323 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Joshua Kwan 2004-06-23 17:46:17 +00:00
parent 033b20f11d
commit a39ceb7ae3
2 changed files with 10 additions and 6 deletions

View File

@ -4,9 +4,8 @@
* Bind with Satan / start using autoconf. * Bind with Satan / start using autoconf.
* Fix a bug in automatic authorization that revealed the username * Fix a bug in automatic authorization that revealed the username
and password in ps output, by munging argv. and password in ps output, by munging argv.
* Fix dgl-create-chroot's copying of terminfo - the terminfo dir * Fix dgl-create-chroot's copying of terminfo by choosing a sane
might be full of symlinks, so dereference them by passing -L to default.
cp. It's SUSv3, honest!
* Now compiles with Tiny C Compiler. * Now compiles with Tiny C Compiler.
1.4.5 (2004/06/14) 1.4.5 (2004/06/14)

View File

@ -23,7 +23,13 @@ playground_fixed="/usr/lib/games/nethack"
# variable data to create (leave blank to skip) (may be equal to previous) # variable data to create (leave blank to skip) (may be equal to previous)
playground_var="/var/games/nethack" playground_var="/var/games/nethack"
# termcap/terminfo (copied recursively) (leave blank to skip) # termcap/terminfo (copied recursively) (leave blank to skip)
termdata="/usr/share/terminfo" if [ -d "/etc/terminfo" ]; then
termdata="/etc/terminfo"
elif [ -d "/usr/share/lib/terminfo" ]; then
termdata="/usr/share/lib/terminfo"
else
termdata="/usr/share/terminfo"
fi
[ -f dgl-create-chroot.conf ] && . ./dgl-create-chroot.conf [ -f dgl-create-chroot.conf ] && . ./dgl-create-chroot.conf
@ -122,8 +128,7 @@ fi
if [ -n "$termdata" ]; then if [ -n "$termdata" ]; then
mkdir -p $chroot_path`dirname $termdata` mkdir -p $chroot_path`dirname $termdata`
if [ -d $termdata/. ]; then if [ -d $termdata/. ]; then
# $termdata might be full of symlinks, like Debian is cp -R $termdata/. $chroot_path$termdata
cp -L -R $termdata/. $chroot_path$termdata
else else
cp $termdata $chroot_path`dirname $termdata` cp $termdata $chroot_path`dirname $termdata`
fi fi