Revised shortcuts code

git-svn-id: svn://tug.org/texlive/trunk@8176 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 27 insertions, 15 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 8659cd31d0c..e2eebd0a57c 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -75,9 +75,11 @@ if (win32) {
     &unregister_script_type
     &broadcast_env
     &update_assocs
-    &add_tl_shortcut
-    &clear_unshortbat
-    &make_tl_shortcuts
+    &add_desktop_shortcut
+    &add_menu_shortcut
+    &remove_desktop_shortcut
+    &remove_menu_shortcut
+    &init_unshortbat
     &create_uninstaller
   ));
 }
@@ -876,8 +878,8 @@ operations might be disturbed.\n\n";
   # post install actions
   #
 
-  # clear batchfile for uninstalling shortcuts
-  clear_unshortbat($vars{'TEXDIR'}) if win32;
+  # (re-)initialize batchfile for uninstalling shortcuts
+  init_unshortbat($vars{'TEXDIR'}) if win32;
 
   foreach my $package (sort keys %install) {
     if ($install{$package} && defined($PostInstall{$package})) {
@@ -983,28 +985,38 @@ operations might be disturbed.\n\n";
   }
 
   if (win32) {
-    add_tl_shortcut(
-      'Desktop',
+    add_desktop_shortcut(
+      $vars{'TEXDIR'},
       'TeXdoc',
+      '', # $vars{'TEXDIR'}.'/tlpkg/doc/notes.ico',
       $vars{'TEXDIR'}.'/bin/win32/texdoctk.bat',
-      "",
-      'batgui', # any non-null value ok
+      '', # no args
+      'batgui', # any non-null value to hide command-prompt
     );
-    add_tl_shortcut(
-      'Desktop',
+    add_desktop_shortcut(
+      $vars{'TEXDIR'},
       'PS_View',
+      $vars{'TEXDIR'}.'/tlpkg/tlpsv/psv.exe', # icon, not prog!
       $vars{'TEXDIR'}.'/bin/win32/psv.bat',
-      "",
+      '',
       'batgui',
     );
-    add_tl_shortcut(
+    add_menu_shortcut(
       'TeXLive',
       'TeXLive Manager',
+      '', # $vars{'TEXDIR'}.'/tlpkg/doc/dummy.ico',
       $vars{'TEXDIR'}.'/bin/win32/tlmgr.bat',
-      "gui",
+      'gui',
       'batgui',
     );
-    make_tl_shortcuts($vars{'TEXDIR'});
+    add_menu_shortcut(
+      'TeXLive',
+      'TeXLive Manual',
+      '', # default pdf icon
+      $vars{'TEXDIR'}.'/texmf-doc/doc/english/texlive-en/live.pdf',
+      '',
+      '',
+    );
   }
 
   # old installer: