Simplify deleting Help folder, more comments format fixes

1 files changed, 7 insertions, 16 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index e03ec8ee4e..d603975a9f 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -321,8 +321,8 @@ WriteUninstaller "$INSTDIR\uninst.exe"
 # Uninstall existing "Second Life Viewer 2" install if needed.

 StrCmp $DO_UNINSTALL_V2 "" REMOVE_SLV2_DONE

   ExecWait '"$PROGRAMFILES\SecondLifeViewer2\uninst.exe" /S _?=$PROGRAMFILES\SecondLifeViewer2'

-  Delete "$PROGRAMFILES\SecondLifeViewer2\uninst.exe"	# with _? option above, uninst.exe will be left behind.

-  RMDir "$PROGRAMFILES\SecondLifeViewer2"	# will remove only if empty.

+  Delete "$PROGRAMFILES\SecondLifeViewer2\uninst.exe"	# With _? option above, uninst.exe will be left behind.

+  RMDir "$PROGRAMFILES\SecondLifeViewer2"	# Will remove only if empty.

 

 REMOVE_SLV2_DONE:

 

@@ -512,7 +512,7 @@ Function CheckNetworkConnection
     StrCpy $2 ""

     ${GetOptions} $COMMANDLINE "/STUBTAG=" $2

     GetTempFileName $0

-    !define HTTP_TIMEOUT 5000		# milliseconds

+    !define HTTP_TIMEOUT 5000		# Milliseconds

 # Don't show secondary progress bar, this will be quick.

     NSISdl::download_quiet \

         /TIMEOUT=${HTTP_TIMEOUT} \

@@ -523,7 +523,7 @@ Function CheckNetworkConnection
     ; Result ignored for now

 	; StrCmp $1 "success" +2

 	;	DetailPrint "Connection failed: $1"

-    Delete $0	# temporary file

+    Delete $0	# Temporary file

     Pop $2

     Pop $1

     Pop $0

@@ -539,7 +539,7 @@ Function RemoveProgFilesOnInst
 # Remove old SecondLife.exe to invalidate any old shortcuts to it that may be in non-standard locations. See MAINT-3575

 Delete "$INSTDIR\SecondLife.exe"

 

-# Remove old shader files first so fallbacks will work. see DEV-5663

+# Remove old shader files first so fallbacks will work. See DEV-5663

 RMDir /r "$INSTDIR\app_settings\shaders"

 

 # Remove skins folder to clean up files removed during development

@@ -556,7 +556,7 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function un.UserSettingsFiles

 

-StrCmp $DO_UNINSTALL_V2 "" Keep			# don't remove user's settings files on auto upgrade

+StrCmp $DO_UNINSTALL_V2 "" Keep			# Don't remove user's settings files on auto upgrade

 

 # Ask if user wants to keep data files or not

 MessageBox MB_YESNO|MB_ICONQUESTION $(RemoveDataFilesMB) IDYES Remove IDNO Keep

@@ -572,7 +572,7 @@ Push $2
 

   LOOP:

     EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

-    StrCmp $1 "" DONE               # no more users

+    StrCmp $1 "" DONE               # No more users

 

     ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

     StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing

@@ -643,15 +643,6 @@ Delete "$INSTDIR\SecondLife.exe"
 Delete "$INSTDIR\VivoxVoiceService-*.log"

 

 # Remove entire help directory

-Delete "$INSTDIR\help\Advanced\*"

-RMDir  "$INSTDIR\help\Advanced"

-Delete "$INSTDIR\help\basics\*"

-RMDir  "$INSTDIR\help\basics"

-Delete "$INSTDIR\help\Concepts\*"

-RMDir  "$INSTDIR\help\Concepts"

-Delete "$INSTDIR\help\welcome\*"

-RMDir  "$INSTDIR\help\welcome"

-Delete "$INSTDIR\help\*"

 RMDir  "$INSTDIR\help"

 

 Delete "$INSTDIR\uninst.exe"