Mercurial > pidgin.yaz
changeset 14603:f63d095dc421
[gaim-migrate @ 17331]
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.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 20 Sep 2006 20:32:43 +0000 |
| parents | 7a8d6f5566cd |
| children | 1e1bcb4a6d82 |
| files | gaim-installer.nsi |
| diffstat | 1 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/gaim-installer.nsi Wed Sep 20 11:52:35 2006 +0000 +++ b/gaim-installer.nsi Wed Sep 20 20:32:43 2006 +0000 @@ -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 - - perl_remove: - Delete "$INSTDIR\plugins\perl.dll" - RMDir /r "$INSTDIR\perlmod" - Goto perl_done + StrCmp $R2 "" perl_done perl_exists 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"