3 files changed, 32 insertions, 58 deletions
diff --git a/Master/tlpkg/installer/tl-tray-menu-custom.bat b/Master/tlpkg/installer/tl-tray-menu-custom.bat
deleted file mode 100755
index a44bfdb3e30..00000000000
--- a/Master/tlpkg/installer/tl-tray-menu-custom.bat
+++ /dev/null
@@ -1,54 +0,0 @@
-@ECHO OFF
-
-rem Sample custom submenu for the tray menu
-rem Usage: edit and copy to the root of the installation.
-
-rem For a batch-mode main menu, see tlmenu.bat.
-
-rem Note. The system tray menu has already taken care of the searchpath.
-
-SETLOCAL ENABLEEXTENSIONS
-SETLOCAL ENABLEDELAYEDEXPANSION
-
-set tlroot=%~dp0
-
-:menuloop
-
-set ans=
-cls
-
-echo === TeX Live Menu ===
-echo.
-echo 1 TexMakerX
-echo 2 Emacs
-echo 3 Notepad
-
-echo Q Quit
-echo.
-set /p ans="Make a choice: "
-
-if "%ans%"=="1" (
-  %tlroot%texmakerx\texmakerx.exe
-  exit
-)
-
-if "%ans%"=="2" (
-  rem load emacs with the included initialization file _emacs
-  %tlroot%emacs\bin\emacs.exe -q -l %tlroot%emacs\_emacs
-  exit
-)
-
-if "%ans%"=="3" (
-  %windir%\notepad.exe
-  exit
-)
-
-if "%ans%"=="Q" (
-  exit
-)
-
-if "%ans%"=="q" (
-  exit
-)
-
-goto :menuloop
diff --git a/Master/tlpkg/installer/tl-tray-menu.ini b/Master/tlpkg/installer/tl-tray-menu.ini
new file mode 100644
index 00000000000..c93a7b3bdcd
--- /dev/null
+++ b/Master/tlpkg/installer/tl-tray-menu.ini
@@ -0,0 +1,26 @@
+;   Example configuration file for TeX Live Menu utility
+;   (to be placed in the same directory as the menu executable)
+;
+; * All lines starting with a semicolon are ignored
+; * Each line after [menu] must be in the format:
+;      <menu label>=<command to execute>
+; * No blank lines are allowed nor whitespace around the equal sign
+; * Optional '&' in the menu label marks the character for keyboard accelaration
+; * Menu commands can contain additional arguments and use environment variables
+;   (e.g., %WINDIR%). 
+; * A program to execute in the menu command can be specified by its name only
+;   (if it is located on the search PATH) or by an absolute or relative file
+;   path. Relative file paths are resolved relative to the location of the menu
+;   program (at the root of your TeX Live installation).
+; * The directory <menu dir>\bin\win32, where <menu dir> is the directory with 
+;   the menu program, is automatically added to the beginning of the search PATH
+; * Number of menu items is limited to 30 and their total size to 32KB
+;
+[menu]
+&Package Manager=tlmgr-gui.exe
+&Documentation=texdoctk.exe
+&Editor=texworks.exe
+;Notepad="%windir%\system32\notepad.exe"
+;Your own choice of portable editor:
+;&Other editor=texmakerx\texmakerx.exe
+&Command Prompt="%COMSPEC%" /k title TeX Live 2011
+\ No newline at end of file
diff --git a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
index 9055d4cb1bc..5b47f7afbd6 100644
--- a/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-scripts.tlpsrc
@@ -13,12 +13,14 @@ runpattern f texmf/scripts/texlive/texconf.tlu
 binpattern f bin/${ARCH}/rungs
 binpattern f bin/${ARCH}/man
 #
-# install-tl and tl-portable
+# install-tl
 runpattern f install-tl
 runpattern f tlpkg/installer/install-menu-*.pl
 binpattern f/win32 install-tl.bat
 binpattern f/win32 install-tl-advanced.bat
-binpattern f/win32 tl-portable.bat
-binpattern f/win32 bin/win32/runscript.*
-#
 docpattern f texmf/doc/man/man1/install-tl.*
+# 
+# runscript and tl-tray-menu
+binpattern f/win32 bin/win32/runscript.*
+binpattern f/win32 tl-tray-menu.exe
+binpattern f/win32 tlpkg/installer/tl-tray-menu.ini