From d5c1b9edc9c0a0c14191a00871f3a9f68a1818f3 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 30 Oct 2009 03:57:01 +0000 Subject: fix for unsecure calls in menu items, the progs have to be quoted since TEXDIR can empbed spaces git-svn-id: svn://tug.org/texlive/trunk@15905 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 2 +- Master/tlpkg/tlpsrc/dviout.win32.tlpsrc | 2 +- Master/tlpkg/tlpsrc/texworks.tlpsrc | 2 +- Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index bb6aeca29e0..7a2f094957c 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1533,7 +1533,7 @@ sub _do_postaction_filetype { my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`; chomp($texdir); my $texdir_bsl = conv_to_w32_path($texdir); - $cmd =~ s!^TEXDIR/!$texdir/!g; + $cmd =~ s!^("?)TEXDIR/!$1$texdir/!g; &log("postaction $how filetype for " . $tlpobj->name . ": $name, $cmd\n"); diff --git a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc b/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc index 803fdd40da1..626e3daf527 100644 --- a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc +++ b/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc @@ -4,5 +4,5 @@ binpattern f/win32 bin/win32/dviout postaction shortcut type=menu name="DVIOUT DVI viewer" \ cmd=TEXDIR/bin/win32/dviout.bat hide=1 \ icon=TEXDIR/tlpkg/dviout/dviout.exe -postaction filetype name=TL.DVIOUT.view cmd='TEXDIR/bin/win32/dviout.bat "%1"' +postaction filetype name=TL.DVIOUT.view cmd='"TEXDIR/bin/win32/dviout.bat" "%1"' postaction fileassoc extension=.dvi filetype=TL.DVIOUT.view diff --git a/Master/tlpkg/tlpsrc/texworks.tlpsrc b/Master/tlpkg/tlpsrc/texworks.tlpsrc index 482c7704fbb..f585d9f8f8f 100644 --- a/Master/tlpkg/tlpsrc/texworks.tlpsrc +++ b/Master/tlpkg/tlpsrc/texworks.tlpsrc @@ -6,7 +6,7 @@ postaction shortcut type=desktop name="TeXworks editor" \ icon=TEXDIR/tlpkg/texworks/TeXworks.exe \ cmd=TEXDIR/bin/win32/texworks.bat hide=1 postaction filetype name=TL.TeXworks.edit \ - cmd='TEXDIR/bin/win32/texworks.bat "%1"' + cmd='"TEXDIR/bin/win32/texworks.bat" "%1"' postaction fileassoc extension=.tex filetype=TL.TeXworks.edit postaction fileassoc extension=.sty filetype=TL.TeXworks.edit postaction fileassoc extension=.cls filetype=TL.TeXworks.edit diff --git a/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc b/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc index e83ea533f43..8c8d5ce9185 100644 --- a/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc +++ b/Master/tlpkg/tlpsrc/tlpsv.win32.tlpsrc @@ -3,9 +3,9 @@ category TLCore # all the archs are created binpattern f/win32 bin/win32/psv runpattern d tlpkg/tlpsv -postaction shortcut type=menu name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd=TEXDIR/bin/win32/psv.bat hide=1 -postaction shortcut type=desktop name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd=TEXDIR/bin/win32/psv.bat hide=1 -postaction filetype name=TL.PSView.view cmd='TEXDIR/bin/win32/psv.bat "%1"' +postaction shortcut type=menu name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd='"TEXDIR/bin/win32/psv.bat"' hide=1 +postaction shortcut type=desktop name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd='"TEXDIR/bin/win32/psv.bat"' hide=1 +postaction filetype name=TL.PSView.view cmd='"TEXDIR/bin/win32/psv.bat" "%1"' postaction fileassoc extension=.eps filetype=TL.PSView.view postaction fileassoc extension=.ps filetype=TL.PSView.view postaction fileassoc extension=.pdf filetype=TL.PSView.view -- cgit v1.2.3