Format for windows \r\n newlines

1 files changed, 21 insertions, 18 deletions

diff --git a/skype4pidgin.nsi b/skype4pidgin.nsi
index 4239511..6c0ef63 100755
--- a/skype4pidgin.nsi
+++ b/skype4pidgin.nsi
@@ -1,13 +1,13 @@
 ; Script based on Off-the-Record Messaging NSI file

 

-
-SetCompress auto
-SetCompressor lzma
+

+SetCompress auto

+SetCompressor lzma

 

 ; todo: SetBrandingImage

 ; HM NIS Edit Wizard helper defines

 !define PRODUCT_NAME "skype4pidgin"

-!define PRODUCT_VERSION "2008-04-08"

+!define PRODUCT_VERSION "24-Apr-2008"

 !define PRODUCT_PUBLISHER "Eion Robb"

 !define PRODUCT_WEB_SITE "http://skype4pidgin.googlecode.com/"

 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

@@ -33,7 +33,7 @@ SetCompressor lzma
 !define MUI_FINISHPAGE_SHOWREADME "http://myjobspace.co.nz/images/pidgin/README.txt"

 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED

 !define MUI_FINISHPAGE_RUN

-!define MUI_FINISHPAGE_RUN_TEXT "Run Pidgin"
+!define MUI_FINISHPAGE_RUN_TEXT "Run Pidgin"

 !define MUI_FINISHPAGE_RUN_FUNCTION "RunPidgin"

 !insertmacro MUI_PAGE_FINISH

 

@@ -49,7 +49,7 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "${PRODUCT_NAME}-installer.exe"

 ;InstallDir "$PROGRAMFILES\skype4pidgin"

 ;InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\skype4pidgin "Install_Dir"

-;WriteRegStr HKLM "SOFTWARE\skype4pidgin" "pidgindir" ""
+;WriteRegStr HKLM "SOFTWARE\skype4pidgin" "pidgindir" ""

 

 Var "PidginDir"

 

@@ -63,26 +63,29 @@ Section "MainSection" SEC01
     Call UnInstOld

     ;Check for pidgin installation

     Call GetPidginInstPath

-    ;WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\skype4pidgin" "pidgindir" "$PidginDir"
+    ;WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\skype4pidgin" "pidgindir" "$PidginDir"

     

-    SetOverwrite try
+    SetOverwrite try

     

 	SetOutPath "$PidginDir\pixmaps\pidgin"

 	File "/oname=protocols\16\skype.png" "icons\16\skype.png"

 	File "/oname=protocols\22\skype.png" "icons\22\skype.png"

-	File "/oname=protocols\48\skype.png" "icons\48\skype.png"
+	File "/oname=protocols\48\skype.png" "icons\48\skype.png"

 	File "/oname=emotes\skype\theme" "theme"

 

 	SetOutPath "$PidginDir\locale"

 	File /nonfatal "/oname=ja\LC_MESSAGES\skype4pidgin.mo" "po\ja.mo"

 	File /nonfatal "/oname=de\LC_MESSAGES\skype4pidgin.mo" "po\de.mo"

 	File /nonfatal "/oname=fr\LC_MESSAGES\skype4pidgin.mo" "po\fr.mo"

+	File /nonfatal "/oname=es\LC_MESSAGES\skype4pidgin.mo" "po\es.mo"

+	File /nonfatal "/oname=nb\LC_MESSAGES\skype4pidgin.mo" "po\nb.mo"

+	File /nonfatal "/oname=en_AU\LC_MESSAGES\skype4pidgin.mo" "po\en_AU.mo"

 

     SetOverwrite try

 	copy:

 		ClearErrors

 		Delete "$PidginDir\plugins\libskype.dll"

-		IfErrors dllbusy
+		IfErrors dllbusy

 		SetOutPath "$PidginDir\plugins"

 	    File "libskype.dll"

 		Goto after_copy

@@ -90,8 +93,8 @@ Section "MainSection" SEC01
 		MessageBox MB_RETRYCANCEL "libskype.dll is busy. Please close Pidgin (including tray icon) and try again" IDCANCEL cancel

 		Goto copy

 	cancel:

-		Abort "Installation of skype4pidgin aborted"
-	after_copy:
+		Abort "Installation of skype4pidgin aborted"

+	after_copy:

 		

 SectionEnd

 

@@ -105,10 +108,10 @@ Function GetPidginInstPath
 		Abort "Failed to find Pidgin installation. Please install Pidgin first."

 cont:

 	StrCpy $PidginDir $0

-FunctionEnd
-
-Function RunPidgin
-	ExecShell "" "$PidginDir\pidgin.exe"
+FunctionEnd

+

+Function RunPidgin

+	ExecShell "" "$PidginDir\pidgin.exe"

 FunctionEnd

 

 Function UnInstOld

@@ -117,7 +120,7 @@ Function UnInstOld
 		IfFileExists "$0" deinst cont

 	deinst:

 		  ClearErrors

-			;ExecWait '"$0" _?=$INSTDIR'
+			;ExecWait '"$0" _?=$INSTDIR'

 			ExecWait '"$0" _?="$PROGRAMFILES\skype4pidgin"'

 			IfErrors 0 cont

 				MessageBox MB_OK|MB_ICONEXCLAMATION  "Uninstall failed or aborted"

@@ -125,4 +128,4 @@ Function UnInstOld
 			

 	cont:

 		

-FunctionEnd
+FunctionEnd