actually address review comments from Bug 326580 - Firefox 2.0 Windows Installer. r=bsmedberg

toolkit/mozapps/installer/windows/install_sub.pl

@@ -292,8 +292,12 @@ sub BuildPlatformInstaller
       die "copy $inConfigFiles/app.tag $gDirDistInstall/nsis";
     
     system("cmd /C 7zipNSIS.bat");
-    move("$gDirDistInstall/nsis/SetupGeneric.exe", "$gDirDistInstall/nsis/$seiFileNameSpecific") ||
+
-      die "move $gDirDistInstall/nsis/SetupGeneric.exe $gDirDistInstall/nsis/$seiFileNameSpecific";
+    # Temporary name change to include -nsis before .exe
+    $nsisFileNameSpecific = $seiFileNameSpecific;
+    $nsisFileNameSpecific =~ s/\.exe$/-nsis\.exe/;
+    move("$gDirDistInstall/nsis/SetupGeneric.exe", "$gDirDistInstall/nsis/$nsisFileNameSpecific") ||
+      die "move $gDirDistInstall/nsis/SetupGeneric.exe $gDirDistInstall/nsis/$nsisFileNameSpecific";
   }
   print " done!\n\n";
 

toolkit/mozapps/installer/windows/nsis/installer.nsi

@@ -665,21 +665,25 @@ Section /o "Quality Feedback Agent" Section3
 SectionEnd
 
 Function install_inspector
+  ${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
     ${RemoveDir} "$INSTDIR\extensions\extensions\inspector@mozilla.org"
     ClearErrors
     ${LogHeader} "Installing Developer Tools"
     StrCpy $R0 "$EXEDIR\optional\extensions\inspector@mozilla.org"
     StrCpy $R1 "$INSTDIR\extensions\inspector@mozilla.org"
     Call DoCopyFiles
+  ${EndIf}
 FunctionEnd
 
 Function install_talkback
+  ${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org"
     ${RemoveDir} "$INSTDIR\extensions\extensions\talkback@mozilla.org"
     ClearErrors
     ${LogHeader} "Installing Quality Feedback Agent"
     StrCpy $R0 "$EXEDIR\optional\extensions\talkback@mozilla.org"
     StrCpy $R1 "$INSTDIR\extensions\talkback@mozilla.org"
     Call DoCopyFiles
+  ${EndIf}
 FunctionEnd
 
 Section "Uninstall"