Menu
▾
▴
[popfile-commit] windows/test pfidiag.nsi,1.8.4.2,1.8.4.3
|
From: Brian S. <xue...@us...> - 2006-02-06 14:18:16
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv368 Modified Files: Tag: b0_22_2 pfidiag.nsi Log Message: Update the link to the NSIS wiki for the ShellLink plugin. Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8.4.2 retrieving revision 1.8.4.3 diff -C2 -d -r1.8.4.2 -r1.8.4.3 *** pfidiag.nsi 22 Sep 2005 19:35:03 -0000 1.8.4.2 --- pfidiag.nsi 6 Feb 2006 14:17:53 -0000 1.8.4.3 *************** *** 5,16 **** # by the Windows installer for POPFile v0.21.0 (or later). # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, --- 5,15 ---- # by the Windows installer for POPFile v0.21.0 (or later). # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile # ! # POPFile is free software; you can redistribute it and/or modify it ! # under the terms of version 2 of the GNU General Public License as ! # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, *************** *** 54,58 **** ; ; The 'NSIS Wiki' page for the 'ShellLink' plugin (description, example and download links): ! ; http://nsis.sourceforge.net/wiki/ShellLink_plugin ; ; To compile this script, copy the 'ShellLink.dll' file to the standard NSIS plugins folder --- 53,57 ---- ; ; The 'NSIS Wiki' page for the 'ShellLink' plugin (description, example and download links): ! ; http://nsis.sourceforge.net/ShellLink_plugin ; ; To compile this script, copy the 'ShellLink.dll' file to the standard NSIS plugins folder *************** *** 100,108 **** #-------------------------------------------------------------------------- ;-------------------------------------------------------------------------- ; POPFile constants have been given names beginning with 'C_' (eg C_README) ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.57" !define C_OUTFILE "pfidiag.exe" --- 99,108 ---- #-------------------------------------------------------------------------- + ;-------------------------------------------------------------------------- ; POPFile constants have been given names beginning with 'C_' (eg C_README) ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.60" !define C_OUTFILE "pfidiag.exe" *************** *** 148,152 **** VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" VIAddVersionKey "FileDescription" "PFI Diagnostic Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 148,152 ---- VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "PFI Diagnostic Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" *************** *** 477,483 **** ; do not support different account types, we treat this error as if user has 'Admin' rights. ! ClearErrors ! UserInfo::GetName ! IfErrors 0 got_name ; Assume Win9x system, so user has 'Admin' rights --- 477,483 ---- ; do not support different account types, we treat this error as if user has 'Admin' rights. ! ClearErrors ! UserInfo::GetName ! IfErrors 0 got_name ; Assume Win9x system, so user has 'Admin' rights *************** *** 488,492 **** got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" --- 488,492 ---- got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" *************** *** 494,498 **** get_usertype: UserInfo::GetAccountType ! Pop ${L_WINUSERTYPE} StrCmp ${L_WINUSERTYPE} "Admin" section_end StrCmp ${L_WINUSERTYPE} "Power" section_end --- 494,498 ---- get_usertype: UserInfo::GetAccountType ! Pop ${L_WINUSERTYPE} StrCmp ${L_WINUSERTYPE} "Admin" section_end StrCmp ${L_WINUSERTYPE} "Power" section_end *************** *** 1427,1434 **** IfFileExists "${L_LNK_FOLDER}\${L_LNK_NAME}\*.*" look_again IntOp ${L_LNK_TOTAL} ${L_LNK_TOTAL} + 1 ! ShellLink::GetShortCutTarget "${L_LNK_FOLDER}\${L_LNK_NAME}" ! Pop ${L_SHORTCUT_TARGET} ! ShellLink::GetShortCutArgs "${L_LNK_FOLDER}\${L_LNK_NAME}" ! Pop ${L_SHORTCUT_ARGS} Push ${L_SHORTCUT_TARGET} --- 1427,1434 ---- IfFileExists "${L_LNK_FOLDER}\${L_LNK_NAME}\*.*" look_again IntOp ${L_LNK_TOTAL} ${L_LNK_TOTAL} + 1 ! ShellLink::GetShortCutTarget "${L_LNK_FOLDER}\${L_LNK_NAME}" ! Pop ${L_SHORTCUT_TARGET} ! ShellLink::GetShortCutArgs "${L_LNK_FOLDER}\${L_LNK_NAME}" ! Pop ${L_SHORTCUT_ARGS} Push ${L_SHORTCUT_TARGET} *************** *** 1445,1450 **** show_details: IntOp ${L_POPFILE_TOTAL} ${L_POPFILE_TOTAL} + 1 ! ShellLink::GetShortCutWorkingDirectory "${L_LNK_FOLDER}\${L_LNK_NAME}" ! Pop ${L_SHORTCUT_START_IN} DetailPrint "" DetailPrint "Shortcut name = < ${L_LNK_NAME} >" --- 1445,1450 ---- show_details: IntOp ${L_POPFILE_TOTAL} ${L_POPFILE_TOTAL} + 1 ! ShellLink::GetShortCutWorkingDirectory "${L_LNK_FOLDER}\${L_LNK_NAME}" ! Pop ${L_SHORTCUT_START_IN} DetailPrint "" DetailPrint "Shortcut name = < ${L_LNK_NAME} >" |
