2 files changed, 13 insertions, 12 deletions

diff --git a/win32/bin/LuaRocks.reg.template b/win32/bin/LuaRocks.reg.template
index 3af1ff34..308b4fa2 100644
--- a/win32/bin/LuaRocks.reg.template
+++ b/win32/bin/LuaRocks.reg.template
@@ -24,30 +24,30 @@ Windows Registry Editor Version 5.00
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\DefaultIcon]
 @="<LUAROCKSPATH>lua.ico"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockpsec\Shell]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\Fetch]
 @="Fetch and install"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\Fetch\Command]
-@="\"<LUAROCKSPATH>luarocksw.bat" install \"%1\" 
+@="\"<LUAROCKSPATH>luarocksw.bat\" install \"%1\"" 
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\Install]
 @="Install Lua module"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\Install\Command]
-@="\"<LUAROCKSPATH>luarocksw.bat" make \"%1\"
+@="\"<LUAROCKSPATH>luarocksw.bat\" make \"%1\""
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\Uninstall]
-@="Install Lua module (this version)"
+@="Uninstall Lua module (this version)"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\Uninstall\Command]
-@="\"<LUAROCKSPATH>luarocksw.bat" remove \"%1\"
+@="\"<LUAROCKSPATH>luarocksw.bat\" remove \"%1\""
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\UninstallAll]
-@="Install Lua module (all versions)"
+@="Uninstall Lua module (all versions)"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Lua.Rockspec\Shell\UninstallAll\Command]
-@="\"<LUAROCKSPATH>luarocksw.bat" removeall \"%1\"
+@="\"<LUAROCKSPATH>luarocksw.bat\" removeall \"%1\""
 
 
diff --git a/win32/bin/luarocksw.bat b/win32/bin/luarocksw.bat
index a0144c44..313508d4 100644
--- a/win32/bin/luarocksw.bat
+++ b/win32/bin/luarocksw.bat
@@ -2,14 +2,14 @@
 setlocal
 SET MYPATH=%~dp0
 
-
+IF NOT [%1]==[] GOTO LETSGO
 ECHO Same as 'luarocks' command, except this
 ECHO command will pause after completion, allowing for
 ECHO examination of output.
-ECHO
+ECHO.
 ECHO For LuaRocks help use:
 ECHO   LUAROCKS HELP
-ECHO
+ECHO.
 ECHO OPTIONS specific for LUAROCKSW:
 ECHO   REMOVEALL is a command specific to this batch file
 ECHO   the option takes a FULL ROCKSPEC filename and then
@@ -25,9 +25,10 @@ ECHO    luarocksw removeall "c:\somedir\modulename-1.0-1.rockspec"
 ECHO will execute:
 ECHO    luarocks remove modulename
 ECHO and will remove all versions of this package
+ECHO.
+GOTO END
 
-
-
+:LETSGO
 REM if REMOVEALL command then info must be stripped from the parameter
 if [%1]==[removeall] goto REMOVEALL