From d75d6e7253432f5407e6c53e92142cad3d5744c1 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 30 Jun 2008 03:57:18 +0000 Subject: [PATCH] DEVEL15-windows-nsis-install-idn-redist-20080629 LICENSE MIT Install IDN on XP and 2003 only (cherry picked from commit fed6593bf343425807f425aeb8315886feeb8670) --- src/WINNT/install/NSIS/OpenAFS.nsi | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi index 2b3b2203f..6cd610844 100644 --- a/src/WINNT/install/NSIS/OpenAFS.nsi +++ b/src/WINNT/install/NSIS/OpenAFS.nsi @@ -532,10 +532,16 @@ Section "!AFS Client" secClient nsExec::Exec "net stop TransarcAFSServer" ; Install the Microsoft IDNM Redistributable + Call GetWindowsVersion + Pop $R1 + StrCmp $R1 "XP" installIDN +1 + StrCmp $R1 "2003" installIDN skipIDN + installIDN: GetTempFileName $R0 File /oname=$R0 "${IDNMREDIST}" nsExec::Exec '$R0 /quiet /norestart' - + skipIDN: + ; Do client components SetOutPath "$INSTDIR\Client\Program" File "${AFS_CLIENT_BUILDDIR}\afsshare.exe" @@ -3628,7 +3634,7 @@ FunctionEnd ; ; Returns on top of stack ; -; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista) +; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista/2008) ; or ; '' (Unknown Windows Version) ; -- 2.39.5