X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=progs%2Fcapconvert;h=bcd56d3dc42a8c5d93f1ff8a8f68bff9c7a36216;hb=HEAD;hp=eb382e0bc86c268ba63f72ae3e270f90bbe00cb4;hpb=b7f1cb3f5063cb3a371f8f1c25c24d03a892a429;p=ncurses.git diff --git a/progs/capconvert b/progs/capconvert index eb382e0b..4b5b321a 100755 --- a/progs/capconvert +++ b/progs/capconvert @@ -1,6 +1,7 @@ #!/bin/sh ############################################################################## -# Copyright (c) 1998-2006,2011 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.5 2011/11/12 23:28:07 Robert.Millan Exp $ +# $Id: capconvert,v 1.12 2022/07/16 21:00:27 tom Exp $ # # capconvert -- automated conversion from termcap to terminfo # @@ -46,7 +47,7 @@ then echo "TERMINFO is already defined in your environment. This means" echo "you already have a local terminfo tree, so you do not need any" echo "conversion." - if test ! -d $TERMINFO ; then + if test ! -d "$TERMINFO" ; then echo "Caution: TERMINFO does not point to a directory!" fi exit; @@ -61,7 +62,7 @@ for p in $TERMINFO \ /usr/local/lib/terminfo \ /usr/local/share/terminfo do - if test -d $p ; then + if test -d "$p" ; then terminfo=yes break fi @@ -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 @@ -110,13 +111,13 @@ TIC= IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for x in $PATH . do - if test $OPT $x/tic + if test "$OPT" "$x"/tic then TIC=$x/tic break fi done -IFS="$ac_save_ifs" +IFS="$save_ifs" if test -n "$TIC" then @@ -139,7 +140,7 @@ echo ""; # # Make the user a terminfo directory -if test -d $HOME/.terminfo +if test -d "$HOME"/.terminfo then echo "It appears you already have a private terminfo directory" echo "at $HOME/.terminfo; this seems odd, because TERMINFO" @@ -149,7 +150,7 @@ then exit; else echo "I am creating your private terminfo directory at $HOME/.terminfo" - mkdir $HOME/.terminfo + mkdir "$HOME"/.terminfo # Ensure that that's where tic's compilation results. # This isn't strictly necessary with a 1.9.7 or later tic. TERMINFO="$HOME/.terminfo"; export TERMINFO @@ -164,8 +165,8 @@ then else # Ooops...looks like we're running from somewhere other than the # progs directory of an ncurses source tree. - master=`find $HOME -name "*terminfo.src" -print` - mcount=`echo $master | wc -l` + master=`find "$HOME" -name "*terminfo.src" -print` + mcount=`find "$HOME" -name "*terminfo.src" | wc -l` case $mcount in 0) echo "I can not find a terminfo source file anywhere under your home directory." @@ -179,16 +180,16 @@ 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:" - echo $master | sed "/^/s// /"; + echo "$master" | sed "/^/s// /"; while : do echo "Please tell me which one to use:" read master; - if test -f $master + if test -f "$master" then break else @@ -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 5 15 -sed -n $master \ +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 +for x in tsplit$$.*; do eval $TIC "$x"; done rm tsplit$$.* -trap 0 1 2 5 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,32 +228,32 @@ 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... -if test -f $HOME/.termcap +if test -f "$HOME"/.termcap then - echo 'I see you have a $HOME/.termcap file. I will compile that.' - eval $TIC $HOME/.termcap + echo "I see you have a \$HOME/.termcap file. I will compile that." + eval $TIC "$HOME"/.termcap echo "Done." echo "Note that editing $HOME/.termcap will no longer change the data curses sees." elif test -f "$TERMCAP" then echo "Your TERMCAP names the file $TERMCAP. I will compile that." - eval $TIC $TERMCAP + eval $TIC "$TERMCAP" echo "Done." echo "Note that editing $TERMCAP will no longer change the data curses sees." else echo "Your TERMCAP value appears to be an entry in termcap format." echo "I will compile it." - echo $TERMCAP >myterm$$ + echo "$TERMCAP" >myterm$$ eval $TIC myterm$$ rm myterm$$ 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