[Gaim-commits] SF.net SVN: gaim: [17331] trunk/gaim-installer.nsi

[<dat...@us...>]

Revision: 17331
          http://svn.sourceforge.net/gaim/?rev=17331&view=rev
Author:   datallah
Date:     2006-09-20 13:32:43 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Don't remove the perl plugin if we can't find ActivePerl.  We no longer have the annoying error popups when a dll dependency isn't found, so this isn't necessary anymore.

Modified Paths:
--------------
    trunk/gaim-installer.nsi

Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2006-09-20 18:07:28 UTC (rev 17330)
+++ trunk/gaim-installer.nsi	2006-09-20 20:32:43 UTC (rev 17331)
@@ -444,19 +444,14 @@
       SetOutPath "$INSTDIR"
     got_shfolder:
 
-    ; Check if Perl is installed, If not remove perl plugin
+    ; Check if Perl is installed, if so add it to the AppPaths
     ReadRegStr $R2 HKLM ${PERL_REG_KEY} ""
     StrCmp $R2 "" 0 perl_exists
       ReadRegStr $R2 HKCU ${PERL_REG_KEY} ""
-      StrCmp $R2 "" perl_remove perl_exists
+      StrCmp $R2 "" perl_done perl_exists
 
-      perl_remove:
-        Delete "$INSTDIR\plugins\perl.dll"
-        RMDir /r "$INSTDIR\perlmod"
-        Goto perl_done
-
       perl_exists:
-        IfFileExists "$R2\bin\${PERL_DLL}" 0 perl_remove
+        IfFileExists "$R2\bin\${PERL_DLL}" 0 perl_done
         StrCmp $R0 "HKLM" 0 perl_done
           ReadRegStr $R3 HKLM "${HKLM_APP_PATHS_KEY}" "Path"
           WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R3;$R2\bin"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.