Added: tlpkg/installer/uninstall-try.[pl|bat],

only tested under windows. It just undoes registry- and environment
settings.
Also: perllib/Win32/Env.pm removed.


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

3 files changed, 11 insertions, 10 deletions

diff --git a/Master/tlpkg/doc/windemo.bat b/Master/tlpkg/doc/windemo.bat
index 4cf04f380c0..0aab32be7c0 100755
--- a/Master/tlpkg/doc/windemo.bat
+++ b/Master/tlpkg/doc/windemo.bat
@@ -2,16 +2,16 @@
 
 rem TeX Live win32 bin directory; ends with backslash
 rem This should also work with UNC names
-set tlwinbin=%~dp0
+set tlsubsub=%~dp0
 
 set PERL5SAVE=%PERL5LIB%
 
-set PERL5LIB=%tlwinbin%..\..\tlpkg\lib\Perl5_lib-TL_inst
-"%tlwinbin%..\..\tlpkg\bin\perl" "%~dpn0" %1 %2 %3 %4 %5 %6 %7 %8 %9
+set PERL5LIB=%tlsubsub%..\..\tlpkg\tlperl\lib
+"%tlsubsub%..\..\tlpkg\tlperl\bin\perl" "%~dpn0.pl" %1 %2 %3 %4 %5 %6 %7 %8 %9
 pause Done
 
 rem cleanup in case of start from command-line
 
 set PERL5LIB=%PERL5SAVE%
 set PERL5SAVE=
-set tlwinbin=
+set tlsubsub=
diff --git a/Master/tlpkg/doc/wingoo-demo.bat b/Master/tlpkg/doc/wingoo-demo.bat
index b3129d46771..d9a2eb68d06 100755
--- a/Master/tlpkg/doc/wingoo-demo.bat
+++ b/Master/tlpkg/doc/wingoo-demo.bat
@@ -2,13 +2,14 @@
 

 rem Directory of this script; ends with backslash

 rem This should also work with UNC names

-set tldoc=%~dp0

+set tlsubsub=%~dp0

+set tlprog=

 set tldrive=%~d0

 

 %tldrive%

-cd %tldoc%

+cd %tlsubsub%

 

-"%tldoc%..\tlperl\bin\perl" "%tldoc%wingoo-demo.pl"

+"%tlsubsub%..\..\tlpkg\tlperl\bin\perl" "%~dpn0.pl" %1 %2 %3 %4 %5 %6 %7 %8 %9

 

 pause Done

 

@@ -17,4 +18,4 @@ rem cleanup in case of start from command-line
 path %pathsave%

 set pathsave=

 set tldrive=

-set tldoc=

+set tlsubsub=

diff --git a/Master/tlpkg/doc/wingoo-demo.pl b/Master/tlpkg/doc/wingoo-demo.pl
index bcf4759d25d..4be176de85a 100644
--- a/Master/tlpkg/doc/wingoo-demo.pl
+++ b/Master/tlpkg/doc/wingoo-demo.pl
@@ -16,7 +16,7 @@ BEGIN {
 
   if ($me=~m!/!) {
     # wingoo-demo now in a subsubdirectory:
-    ($::installerdir=$me)=~s!(.*)\/tlpkg\/doc\/.*$!$1!;
+    ($::installerdir=$me)=~s!(.*)/[^/]+/[^/]+/[^/]*$!$1!;
   } else {
     # This shouldn't occur if called from batchfile
     $::installerdir='./../..';
@@ -26,7 +26,7 @@ BEGIN {
 }
 
 use TeXLive::TLUtils qw( get_system_tmpdir );
-use TeXLive::TLWinGooTry qw(
+use TeXLive::TLWinGoo qw(
   &admin
   &non_admin
   &admin_again