I hope this irons out the Add/Remove kinks on Win2K for users w/o Admin
privs, but haven't tested that yet. Doesn't hurt on Win98SE, anyway.
diff --git a/PCbuild/Uninstal.wse b/PCbuild/Uninstal.wse
index 6836eea..04213de 100644
--- a/PCbuild/Uninstal.wse
+++ b/PCbuild/Uninstal.wse
@@ -1,6 +1,6 @@
Document Type: WSE
item: Global
- Version=8.11
+ Version=8.14
Flags=00000100
Split=1420
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -19,7 +19,16 @@
Patch Memory=4096
Per-User Version ID=1
Crystal Format=10111100101100000010001001001001
- File Checksum=2338111989
+ Step View=&Properties
+end
+item: Remark
+ Text=Note from Tim: This is a verbatim copy of Wise's Uninstal.wse, altered at the end to write
+end
+item: Remark
+ Text=uninstall info under HKCU instead of HKLM if the user doesn't have Admin privs.
+end
+item: Remark
+ Text=Hmm! Also changed it to use the 32-bit uninstaller!
end
item: Remark
end
@@ -431,7 +440,7 @@
Flags=10111111
end
item: Remark
- Text=Write under HKLM.
+ Text=Write uninstall info under HKLM. This if/else/end block added by Tim.
end
item: Edit Registry
Total Keys=1
@@ -451,7 +460,7 @@
item: Else Statement
end
item: Remark
- Text=Write under HKCU, but identical otherwise.
+ Text=The same, but write under HKCU instead.
end
item: Edit Registry
Total Keys=1
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 32a2302..f94cf55 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1,6 +1,6 @@
Document Type: WSE
item: Global
- Version=8.12
+ Version=8.14
Title=Python 2.2 alpha 1
Flags=00010100
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -1846,6 +1846,9 @@
Value=A
Flags=00001010
end
+item: Remark
+ Text=Registering file extensions requires Admin privs.
+end
item: If/While Statement
Variable=COMPONENTS
Value=E
@@ -2063,9 +2066,6 @@
Text=Ack, and "Win2K" isn't enough either -- you can't actually do this without Admin privs too.
end
item: Check Configuration
- Flags=11110010
-end
-item: Check Configuration
Flags=10111111
end
item: Edit Registry
@@ -2089,7 +2089,46 @@
Root=2
end
end
-item: End Block
+item: Else Statement
+end
+item: Remark
+ Text=Same thing, except write to HKCU instead.
+end
+item: Remark
+ Text=Damn -- this "edit keys" cmd was created by the Installation Expert view, and I duplicated and
+end
+item: Remark
+ Text=edited it by hand. The info comes from the "Windows 2000" section of the Properties view,
+end
+item: Remark
+ Text=and if you change it there it will only show up in the "if" block above.
+end
+item: Remark
+ Text=Easiest to make corresponding changes in *this* block by editing this script in
+end
+item: Remark
+ Text=a plain text editor.
+end
+item: Edit Registry
+ Total Keys=3
+ item: Key
+ Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+ New Value=http://www.python.org/
+ Value Name=HelpLink
+ Root=1
+ end
+ item: Key
+ Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+ New Value=PythonLabs at Zope Corporation
+ Value Name=Publisher
+ Root=1
+ end
+ item: Key
+ Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+ New Value=http://www.python.org/
+ Value Name=URLInfoAbout
+ Root=1
+ end
end
item: End Block
end