Fixed .nsi so that it actually works

1 files changed, 28 insertions, 27 deletions

diff --git a/skype4pidgin.nsi b/skype4pidgin.nsi
index b583f70..6b1862c 100755
--- a/skype4pidgin.nsi
+++ b/skype4pidgin.nsi
@@ -20,7 +20,7 @@
 ; Welcome page

 !insertmacro MUI_PAGE_WELCOME

 ; License page

-!insertmacro MUI_PAGE_LICENSE 

+!insertmacro MUI_PAGE_LICENSE "COPYING.txt"

 ; Directory page

 !insertmacro MUI_PAGE_DIRECTORY

 ; Instfiles page

@@ -56,33 +56,34 @@ Section "MainSection" SEC01
     ;Check for pidgin installation

     Call GetPidginInstPath

     WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\skype4pidgin" "pidgindir" "$PidginDir"

-	SetOutPath "$PidginDir\pixmaps\pidgin\protocols\16"
-	SetOverwrite on
-	File "16\skype.png"
-	
-	SetOutPath "$PidginDir\pixmaps\pidgin\protocols\22"
-	SetOverwrite on
-	File "22\skype.png"
-	
-	SetOutPath "$PidginDir\pixmaps\pidgin\protocols\48"
-	SetOverwrite on
-	File "48\skype.png"
-	
-	CreateDirectory "$PidginDir\pixmaps\pidgin\emotes\skype"
-	SetOutPath "$PidginDir\pixmaps\pidgin\emotes\skype"
-	SetOverwrite on
-	File "theme"
-	
+	SetOutPath "$PidginDir\pixmaps\pidgin\protocols\16"

+	SetOverwrite on

+	File "icons\16\skype.png"

+	

+	SetOutPath "$PidginDir\pixmaps\pidgin\protocols\22"

+	SetOverwrite on

+	File "icons\22\skype.png"

+	

+	SetOutPath "$PidginDir\pixmaps\pidgin\protocols\48"

+	SetOverwrite on

+	File "icons\48\skype.png"

+	

+	CreateDirectory "$PidginDir\pixmaps\pidgin\emotes\skype"

+	SetOutPath "$PidginDir\pixmaps\pidgin\emotes\skype"

+	SetOverwrite on

+	File "theme"

+	

 

     SetOutPath "$INSTDIR"

     SetOverwrite on

-    File "libskype.dll"

+    ;File "libskype.dll"

+    File "\\5.5.242.9\tmp\skype\libskype.dll"

     ; move to pidgin plugin directory, check if not busy (pidgin is running)

     call CopyDLL

     ; hard part is done, do the rest now.

-    SetOverwrite on
-    File "skype4pidgin.nsi"
-    File "README.txt"
+    SetOverwrite on

+    File "skype4pidgin.nsi"

+    File "README.txt"

     File "CHANGELOG.txt"

 SectionEnd

 

@@ -114,7 +115,7 @@ FunctionEnd
 Section Uninstall

   Delete "$INSTDIR\skype4pidgin-uninst.exe"

   Delete "$INSTDIR\README.txt"

-  Delete "$INSTDIR\CHANGELOG.txt"
+  Delete "$INSTDIR\CHANGELOG.txt"

   Delete "$INSTDIR\skype4pidgin.nsi"

   Delete "$SMPROGRAMS\skype4pidgin\Uninstall.lnk"

   RMDir "$SMPROGRAMS\skype4pidgin"

@@ -131,10 +132,10 @@ Section Uninstall
 	IfFileExists "$PidginDir\plugins\libskype.dll" dodelete

   MessageBox MB_OK|MB_ICONINFORMATION "Could not find pidgin plugin directory, pidgin-otr.dll not uninstalled!" IDOK ok

 dodelete:

-	Delete "$PidginDir\plugins\libskype.dll"
-	Delete "$PidginDir\pixmaps\pidgin\protocols\16\skype.png"
-	Delete "$PidginDir\pixmaps\pidgin\protocols\22\skype.png"
-	Delete "$PidginDir\pixmaps\pidgin\protocols\48\skype.png"
+	Delete "$PidginDir\plugins\libskype.dll"

+	Delete "$PidginDir\pixmaps\pidgin\protocols\16\skype.png"

+	Delete "$PidginDir\pixmaps\pidgin\protocols\22\skype.png"

+	Delete "$PidginDir\pixmaps\pidgin\protocols\48\skype.png"

 	Delete "$PidginDir\pixmaps\pidgin\emotes\skype\theme"

     RMDir "$PidginDir\pixmaps\pidgin\emotes\skype"