XXX Remove nawk(1)

@@ -96,11 +96,11 @@
 Libdl=usr/lib/libdl.so.1
 Cpio=usr/bin/cpio
 Rm=usr/bin/rm
 Ln=usr/bin/ln
 Mv=usr/bin/mv
-Nawk=usr/bin/nawk
+Awk=usr/xpg4/bin/awk
 Zcat=usr/bin/zcat
 
 # Set up the default paths
 MV_xpath=/usr/bin
 MV_cmd=$MV_xpath/mv

@@ -108,20 +108,20 @@
 CPIO_cmd=$CPIO_xpath/cpio
 ZCAT_xpath=/usr/bin
 ZCAT_cmd=$ZCAT_xpath/zcat
 LN_xpath=/usr/bin
 LN_cmd=$LN_xpath/ln
-NAWK_xpath=/usr/bin
-NAWK_cmd=$NAWK_xpath/nawk
+AWK_xpath=/usr/xpg4/bin/
+AWK_cmd=$AWK_xpath/awk
 RM_xpath=/usr/bin
 RM_cmd=$RM_xpath/rm
 Tmp_xpath=/usr/tmp$$dir
 Tmp_Creat=0
 rm_cpio=0
 rm_ln=0
 rm_zcat=0
-rm_nawk=0
+rm_awk=0
 rm_rm=0
 rm_mv=0
 no_select=0
 
 # Functions

@@ -156,11 +156,11 @@
                         $Libw)          Spcl_lib=1; file=libw.so.1;;
                         $Libdl)         Spcl_lib=1; file=libdl.so.1;;
                         $Cpio)          rm_cpio=1; Spcl_exec=1;;
                         $Ln)            rm_ln=1; Spcl_exec=1;;
                         $Zcat)          rm_zcat=1; Spcl_exec=1;;
-                        $Nawk)          rm_nawk=1; Spcl_exec=1;;
+                        $Awk)           rm_awk=1; Spcl_exec=1;;
                         $Rm)            rm_rm=1; Spcl_exec=1;;
                         $Mv)            rm_mv=1; Spcl_exec=1;;
                 esac
 
                 if [ $no_select -eq 1 ]; then

@@ -205,15 +205,15 @@
                         elif [ $rm_ln -eq 1 ]; then
                                 $Tmp_xpath/ln -s ../..$Tmp_xpath/ln $1
                                 LN_cmd="$Tmp_xpath/ln"
                                 Movelist="$1 ln $Movelist"
                                 rm_ln=0
-                        elif [ $rm_nawk -eq 1 ]; then
-                                $LN_cmd -s ../..$Tmp_xpath/nawk $1
-                                NAWK_cmd="$Tmp_xpath/nawk"
-                                Movelist="$1 nawk $Movelist"
-                                rm_nawk=0
+                        elif [ $rm_awk -eq 1 ]; then
+                                $LN_cmd -s ../..$Tmp_xpath/awk $1
+                                AWK_cmd="$Tmp_xpath/awk"
+                                Movelist="$1 awk $Movelist"
+                                rm_awk=0
                         elif [ $rm_zcat -eq 1 ]; then
                                 $LN_cmd -s ../..$Tmp_xpath/zcat $1
                                 ZCAT_cmd="$Tmp_xpath/zcat"
                                 Movelist="$1 zcat $Movelist"
                                 rm_zcat=0

@@ -238,11 +238,11 @@
 #
 # Clean up the libraries and executables that were moved.
 #
 exec_clean() {  # $1 =1 means be quiet
         if [ ! -z "${Movelist}" ]; then
-                echo $Movelist | $NAWK_cmd '
+                echo $Movelist | $AWK_cmd '
                         { split ($0, line)
                         for (n=1; n <= NF; n++) {
                                 print line[n]
                         }
                 }' | while read path; do

@@ -262,11 +262,11 @@
                         if [ -x $path ]; then
                                 case $path in
                                         $Cpio)  CPIO_cmd="$CPIO_xpath/cpio";;
                                         $Ln)    LN_cmd="$LN_xpath/ln";;
                                         $Zcat)  ZCAT_cmd="$ZCAT_xpath/zcat";;
-                                        $Nawk)  NAWK_cmd="$NAWK_xpath/nawk";;
+                                        $Awk)   AWK_cmd="$AWK_xpath/awk";;
                                         $Rm)    RM_cmd="$RM_xpath/rm";;
                                         $Mv)    MV_cmd="$MV_xpath/mv";;
                                 esac
                         fi
                 done

@@ -416,11 +416,11 @@
                         done
 
                         # If there's a path containing a '$' then we can't
                         # use the extraction list because of the shell
                         if [ $list_empty -eq 0 ]; then
-                                s=`LD_PRELOAD="$Ld_Preload" $NAWK_cmd ' /\\$/ { print } ' $FILELIST`
+                                s=`LD_PRELOAD="$Ld_Preload" $AWK_cmd ' /\\$/ { print } ' $FILELIST`
 
                                 if [ ! -z "${s}" ]; then
                                         is_a_filelist=0
                                 fi
                         fi

@@ -447,11 +447,11 @@
                         done
 
                         # If there's a path containing a '$' then we can't
                         # use the extraction list because of the shell
                         if [ $list_empty -eq 0 ]; then
-                                s=`LD_PRELOAD="$Ld_Preload" $NAWK_cmd ' /\\$/ { print } ' $FILELIST`
+                                s=`LD_PRELOAD="$Ld_Preload" $AWK_cmd ' /\\$/ { print } ' $FILELIST`
 
                                 if [ ! -z "${s}" ]; then
                                         is_a_filelist=0
                                 fi
                         fi