ncurses 6.3 - patch 20220326

[ncurses.git] / progs / capconvert

diff --git a/progs/capconvert b/progs/capconvert
index 716203ae967e9095f96eef12c156b8f343dfe71c..ea76f312497cc09b1064f09fa235bcc6fbaba939 100755 (executable)
--- a/progs/capconvert
+++ b/progs/capconvert
@@ -1,6 +1,7 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998-2011,2017 Free Software Foundation, Inc.                #
+# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
+# Copyright 1998-2011,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -26,7 +27,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: capconvert,v 1.6 2017/08/12 12:22:06 tom Exp $
+# $Id: capconvert,v 1.11 2022/02/05 20:39:49 tom Exp $
 #
 # capconvert -- automated conversion from termcap to terminfo
 #
@@ -94,7 +95,7 @@ else
 fi
 echo "";
 
-# Check if test -x works (it's not portable, but useful)
+# Check if test -x works (it is not portable, but useful)
 OPT="-x"
 TMP=test$$; touch $TMP && chmod 755 $TMP
 if test $OPT $TMP ; then
@@ -179,7 +180,7 @@ else
                echo "I am going to assume this is the terminfo source included with"
                echo "the ncurses distribution.  If this assumption is wrong, please"
                echo "interrupt me now!  OK to continue?"
-               read ans;
+               read answer;
        ;;
        2)
                echo "I see more than one possible terminfo source.  Here they are:"
@@ -205,14 +206,15 @@ echo "OK, now I will make your private terminfo tree.  This may take a bit..."
 #
 # Kluge alert: we compile terminfo.src in two pieces because a lot of machines
 # with < 16MB RAM choke on tic's core-hog habits.
-trap "rm -f tsplit$$.*" 0 1 2 3 15
+trap "rm -f tsplit$$.*; exit 1" 1 2 3 15
+trap "rm -f tsplit$$.*" 0
 sed -n $master \
        -e '1,/SPLIT HERE/w 'tsplit$$.01 \
        -e '/SPLIT HERE/,$w 'tsplit$$.02 \
        2>/dev/null
 for x in tsplit$$.*; do eval $TIC $x; done
 rm tsplit$$.*
-trap 0 1 2 3 15
+trap EXIT INT QUIT TERM HUP
 #
 echo "You now have a private tree under $HOME/.terminfo;"
 echo "the ncurses library will automatically read from it,"
@@ -226,7 +228,7 @@ fi
 
 # OK, here comes the nasty case...user has a TERMCAP.  Instead of
 # trying to follow all the convolutions of the relationship between
-# TERM and TERMCAP (partly because it's too painful, and partly because
+# TERM and TERMCAP (partly because it is too painful, and partly because
 # we don't actually know what TERM will be nor even if it always has
 # the same value for this user) we do the following three steps...
 
@@ -251,7 +253,7 @@ else
        echo "Done."
        echo "Note that editing TERMCAP will no longer change the data curses sees."
 fi
-echo "To do that, decompile the terminal decription you want with infocmp(1),"
+echo "To do that, decompile the terminal description you want with infocmp(1),"
 echo "edit to taste, and recompile using tic(1)."
 
 # capconvert ends here