texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[7146] texi2dvi use SED variable


From: Gavin D. Smith
Subject: [7146] texi2dvi use SED variable
Date: Wed, 04 May 2016 18:15:03 +0000

Revision: 7146
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7146
Author:   gavin
Date:     2016-05-04 18:15:03 +0000 (Wed, 04 May 2016)
Log Message:
-----------
texi2dvi use SED variable

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-04 06:11:44 UTC (rev 7145)
+++ trunk/ChangeLog     2016-05-04 18:15:03 UTC (rev 7146)
@@ -1,5 +1,10 @@
-2016-05-05  Gavin Smith  <address@hidden>
+2016-05-04  Gavin Smith  <address@hidden>
 
+       * util/texi2dvi (cd_orig, cd_dir): Use SED variable instead of 
+       sed directly.
+
+2016-05-03  Gavin Smith  <address@hidden>
+
        * util/texi2dvi (usage): Change wording of documentation of 
        --mostly-clean option.
        (input_file_name_decode): Remove unused 'in_dir_abs' variable.

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2016-05-04 06:11:44 UTC (rev 7145)
+++ trunk/util/texi2dvi 2016-05-04 18:15:03 UTC (rev 7146)
@@ -242,7 +242,7 @@
 {
   cd "$1"
   # Replace each path component with ".." and remove any trailing slash.
-  cdd_prefix=`echo "$1" | sed -e 's/[^/\\][^/\\]*/../g' -e 's/[/\\]$//'`
+  cdd_prefix=`echo "$1" | \$SED -e 's/[^/\\][^/\\]*/../g' -e 's/[/\\]$//'`
 
   # Add this prefix for some variables.
   for cdd_dir in $path_vars; do
@@ -277,15 +277,15 @@
   
   # strip off ../../ from some variables
   # quote string by placing \ before each character (each either . or /)
-  cdd_prefix_q=`echo "$cdd_prefix" | sed -e 's/\\(.\\)/\\\\\\1/g'`
+  cdd_prefix_q=`echo "$cdd_prefix" | \$SED -e 's/\\(.\\)/\\\\\\1/g'`
   # after backslashes quote within backquoted string:
-  #             echo "$cdd_prefix" | sed -e 's/\(.\)/\\\1/g'
+  #             echo "$cdd_prefix" | $SED -e 's/\(.\)/\\\1/g'
 
   for cdo_dir in $path_vars ; do
-    eval "$cdo_dir=\`echo \"\$$cdo_dir\" | sed -e 's/^$cdd_prefix_q\///'\`"
+    eval "$cdo_dir=\`echo \"\$$cdo_dir\" | \$SED -e 's/^$cdd_prefix_q\///'\`"
 
     # Becomes
-    # CDO_DIR=`echo "$CDO_DIR" | sed -e 's/^CDD_PREFIX//'`
+    # CDO_DIR=`echo "$CDO_DIR" | $SED -e 's/^CDD_PREFIX//'`
 
     # eval $cdo_dir=\${$cdo_dir#\$cdd_prefix/}
     # would be simpler, but doesn't work in older shells.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]