Mercurial > octave-nkf

changeset 11252:d048ce3f7cef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace "delete" with "del" in DOS shell commands.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 14 Nov 2010 22:01:45 +0000
parents 77989197a3c7
children 093c9facf0f0
files scripts/ChangeLog scripts/plot/__gnuplot_print__.m scripts/plot/print.m
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Sun Nov 14 21:57:19 2010 +0000
+++ b/scripts/ChangeLog	Sun Nov 14 22:01:45 2010 +0000
@@ -1,3 +1,9 @@
+2010-11-14  Michael Goffioul  <michael.goffioul@gmail.com>
+
+	* plot/print.m: Use "del" instead of "delete" in DOS shell, and
+	replace	forward slashes with backslashes.
+	* plot/__gnuplot_print__.m: Likewise.
+
 2010-11-14  Jaroslav Hajek  <highegg@gmail.com>
 
 	* optimization/__all_opts__.m: Ensure that the array is always
--- a/scripts/plot/__gnuplot_print__.m	Sun Nov 14 21:57:19 2010 +0000
+++ b/scripts/plot/__gnuplot_print__.m	Sun Nov 14 22:01:45 2010 +0000
@@ -57,7 +57,7 @@
       tmp_file = strcat (tmpnam (), ".eps");
       eps_drawnow (opts, tmp_file, gp_opts);
       if (dos_shell)
-        cleanup = sprintf (" & delete %s", tmp_file);
+        cleanup = sprintf (" & del %s", strrep (tmp_file, '/', '\'));
       else
         cleanup = sprintf (" ; rm %s", tmp_file);
       endif
@@ -123,7 +123,7 @@
       cmd = sprintf ("%s", cmd_gs);
     endif
     if (dos_shell)
-      cmd = sprintf ("%s & delete %s", cmd, opts.ghostscript.source);
+      cmd = sprintf ("%s & del %s", cmd, strrep (opts.ghostscript.source, '/', '\'));
     else
       cmd = sprintf ("%s ; rm %s", cmd, opts.ghostscript.source);
     endif
--- a/scripts/plot/print.m	Sun Nov 14 21:57:19 2010 +0000
+++ b/scripts/plot/print.m	Sun Nov 14 22:01:45 2010 +0000
@@ -400,7 +400,7 @@
   ## output must be piped.
 
   ## DOS Shell:
-  ##   copy con <filein> & epstool -bbox -preview-tiff <filein> <fileout> & delete <filein>
+  ##   copy con <filein> & epstool -bbox -preview-tiff <filein> <fileout> & del <filein>
   ## Unix Shell;
   ##   cat > <filein> ; epstool -bbox -preview-tiff <filein> <fileout> ; rm <filein>
 
@@ -417,7 +417,7 @@
     pipein = true;
     filein = strcat (tmpnam (), ".eps");
     if (dos_shell)
-      cleanup = sprintf ("& delete %s ", filein);
+      cleanup = sprintf ("& del %s ", strrep (filein, '/', '\'));
     else
       cleanup = sprintf ("; rm %s ", filein);
     endif
@@ -429,7 +429,7 @@
     pipeout = true;
     fileout = strcat (tmpnam (), ".eps");
     if (dos_shell)
-      cleanup = horzcat (cleanup, sprintf ("& delete %s ", fileout));
+      cleanup = horzcat (cleanup, sprintf ("& del %s ", strrep (fileout, '/', '\')));
     else
       cleanup = horzcat (cleanup, sprintf ("; rm %s ", fileout));
     endif