177163 - Eliminate valname variable and simplify code for setting reg values

Status: VERIFIED FIXED

(SeaMonkey :: Installer, defect)

Description

[Curt Patrick (gone)]

This is purely code cleanup for maintenance purposes:  eliminating some
unecassary variables, consolidating lines of codes, making it more readable.

Comment 1

[Curt Patrick (gone)]

Attachment: Patch 1

Comment 2

[Henrik Gemal]

perhaps in this patch we could also get rid of the "seamonkey" regdb key?
it's bug 127420

Comment 3

[Curt Patrick (gone)]

Attachment: Patch 2

Adds the seamonkey cleanup that gemal requested.  Otherwise the same as Patch 1

Comment 4

[Henrik Gemal]

Curt: Thanx for the quick fix.

I was looking the the patch and found a reference to "NSUninst.exe" to places in
the mozilla code. Isn't "NSUninst.exe" a Netscape only thing. Perhaps it should
be moved to the netscape tree.

http://lxr.mozilla.org/mozilla/source/xpinstall/packager/windows/browser.jst#384

Comment 5

[Curt Patrick (gone)]

Attachment: Patch 3

I guess that if we are cleaning up code we'd just as well really clean it up. 
This patch corrects the js scripts to use "MozillaUninstall.exe" instead of
"NSUninst.exe".  Further, I'm using the $UninstallFile$ variable instead of
hardcoding it (this could stand to be done for the NS scripts also, I suppose,
but at least they are hardcoded to the right thing).

BTW, this code was part of a fix which David put in a few months back for
Windows XP.  There is no way it could have been working for Mozilla.  I don't
have Windows XP available to test against but, since it has certainly never
worked it certainly isn't going to be any more broken if I check this code in. 
I can describe to QA how to test it, but I'll have to get to an XP machine to
do even that.

Comment 6

[[e-mail] (away - not reading bugmail)]

Comment on attachment 104523 [details] [diff] [review]
Patch 3

r=jbetak

I tried to follow the whole patch and although it's largely mechanical code
consolidation, it wasn't easy :-)

I found another Seamonkey reference and had to wonder what it is for:

;Delete FileX sections
[Delete File0]
Timing=post download
Destination=[COMMON_PROGRAMS]\Mozilla Seamonkey\Mozilla AppRunner.lnk

Comment 7

[Henrik Gemal]

There's also a lot of funky stuff going on in config.it:
http://lxr.mozilla.org/mozilla/source/xpinstall/packager/windows/config.it#1032
fx "Net2fone.exe" "lala land" land.
it's remove those at the same time

Comment 8

[Curt Patrick (gone)]

So the Net2fone and other shortcut sections in config.ini are commented out.  I
think Sean was in the habit of commenting out instead of removing historic
sections because they had the habit of coming back again sometimes.  I can--and
will, if that is what we want done--remove those commented sections, though.

Comment 9

[Daniel Veditz [:dveditz]]

Comment on attachment 104523 [details] [diff] [review]
Patch 3

>Index: config.it
>===================================================================
>-;extract_msg=Uncompressing Seamonkey.  Please wait...
>+;extract_msg=Uncompressing Mozilla.  Please wait...

Wouldn't this be uncompressing the install files rather than Mozilla
itself? Does this run before or after the download?

(I'm fine with the Seamonkey->Mozilla change, just not sure
whether it should be "Mozilla installer" or something instead)

> [Windows Registry10]
> Root Key=HKEY_LOCAL_MACHINE
> Key=Software\Mozilla
> Name=
> Name Value=

Do you need to leave this one if there aren't any subkeys?
Doesn't hurt since it just gets created later, and maybe even 
helps if the .jst scripts aren't smart enough to create it
before they start adding to it. But since this seems to be a
"cleanup" bug I thought I'd mention it.

You've got another bug for the equivalent commercial changes?

sr=dveditz without or without the above optional suggestions.

Comment 10

[Curt Patrick (gone)]

Checked in.

Comment 11

[Grace Bush]

verified code fix

Comment 12

[Curt Patrick (gone)]

Hello Grace.  It would be a very good idea to do some checking in the registry
to make certain that all the settings are getting made the same as before this
change went in.  Behavior should not change at all, but how I get that behavior
has been modified pretty significantly so you should keep a sharp eye out for
anyplace that is doing something differently from before in the registry.