sane default for terminfo

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@323 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

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

diff --git a/dgl-create-chroot b/dgl-create-chroot
index 42ac4aba73503a7c3fa436830b525be83750902c..76ed434d883e7017c690d906be3e07c3ce1345a7 100755 (executable)
--- a/dgl-create-chroot
+++ b/dgl-create-chroot
@@ -23,7 +23,13 @@ playground_fixed="/usr/lib/games/nethack"
 # variable data to create (leave blank to skip) (may be equal to previous)
 playground_var="/var/games/nethack"
 # 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
 
@@ -122,8 +128,7 @@ fi
 if [ -n "$termdata" ]; then
        mkdir -p $chroot_path`dirname $termdata`
        if [ -d $termdata/. ]; then
-               # $termdata might be full of symlinks, like Debian is
-               cp -L -R $termdata/. $chroot_path$termdata
+               cp -R $termdata/. $chroot_path$termdata
        else
                cp $termdata $chroot_path`dirname $termdata`
        fi