Menu
▾
▴
[popfile-commit] windows adduser-Uninstall.nsh,1.1,1.2 adduser-Version.nsh,1.5,1.6 adduser.nsi,1.77,1.78 installer-SecPOPFile-body.nsh,1.2,1.3 installer-Uninstall.nsh,1.2,1.3 installer.nsi,1.259,1.260
|
From: Brian S. <xue...@us...> - 2005-08-12 12:58:32
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23948 Modified Files: adduser-Uninstall.nsh adduser-Version.nsh adduser.nsi installer-SecPOPFile-body.nsh installer-Uninstall.nsh installer.nsi Log Message: Install the new POPFile SQLite Database Status Check utility if it is available and create shortcuts to it if POPFile is configured to use SQLite for the current user. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** installer-SecPOPFile-body.nsh 23 Mar 2005 14:15:44 -0000 1.2 --- installer-SecPOPFile-body.nsh 12 Aug 2005 12:58:23 -0000 1.3 *************** *** 208,211 **** --- 208,212 ---- File "runsqlite.exe" File "adduser.exe" + File /nonfatal "test\pfidbstatus.exe" File /nonfatal "test\pfidiag.exe" File "msgcapture.exe" Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.259 retrieving revision 1.260 diff -C2 -d -r1.259 -r1.260 *** installer.nsi 2 Aug 2005 23:23:24 -0000 1.259 --- installer.nsi 12 Aug 2005 12:58:23 -0000 1.260 *************** *** 18,22 **** # (B) The following programs (built using NSIS) are optional: # ! # (1) pfidiag.exe (NSIS script: test\pfidiag.nsi) # # Copyright (c) 2002-2005 John Graham-Cumming --- 18,23 ---- # (B) The following programs (built using NSIS) are optional: # ! # (1) pfidbstatus.exe (NSIS script: test\pfidbstatus.nsi) ! # (2) pfidiag.exe (NSIS script: test\pfidiag.nsi) # # Copyright (c) 2002-2005 John Graham-Cumming Index: adduser-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** adduser-Uninstall.nsh 2 Mar 2005 19:50:18 -0000 1.1 --- adduser-Uninstall.nsh 12 Aug 2005 12:58:23 -0000 1.2 *************** *** 466,470 **** --- 466,472 ---- SetDetailsPrint listonly + Delete "$G_USERDIR\Check database status.lnk" Delete "$G_USERDIR\Run SQLite utility.lnk" + Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\Check database status.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Uninstall POPFile Data ($G_WINUSERNAME).lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\User Data ($G_WINUSERNAME).lnk" Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** installer-Uninstall.nsh 2 Aug 2005 23:23:24 -0000 1.2 --- installer-Uninstall.nsh 12 Aug 2005 12:58:23 -0000 1.3 *************** *** 424,441 **** Delete "$G_ROOTDIR\runpopfile.exe" Delete "$G_ROOTDIR\adduser.exe" - Delete "$G_ROOTDIR\sqlite.exe" Delete "$G_ROOTDIR\runsqlite.exe" ! Delete "$G_ROOTDIR\pfidiag.exe" Delete "$G_ROOTDIR\msgcapture.exe" Delete "$G_ROOTDIR\pfimsgcapture.exe" - IfFileExists "$G_ROOTDIR\pfidiag.exe" try_again IfFileExists "$G_ROOTDIR\msgcapture.exe" try_again ! IfFileExists "$G_ROOTDIR\msgcapture.exe" 0 continue try_again: Sleep 1000 - Delete "$G_ROOTDIR\pfidiag.exe" Delete "$G_ROOTDIR\msgcapture.exe" Delete "$G_ROOTDIR\pfimsgcapture.exe" --- 424,445 ---- Delete "$G_ROOTDIR\runpopfile.exe" Delete "$G_ROOTDIR\adduser.exe" Delete "$G_ROOTDIR\runsqlite.exe" ! Delete "$G_ROOTDIR\sqlite.exe" ! Delete "$G_ROOTDIR\msgcapture.exe" + Delete "$G_ROOTDIR\pfidbstatus.exe" + Delete "$G_ROOTDIR\pfidiag.exe" Delete "$G_ROOTDIR\pfimsgcapture.exe" IfFileExists "$G_ROOTDIR\msgcapture.exe" try_again ! IfFileExists "$G_ROOTDIR\pfidbstatus.exe" try_again ! IfFileExists "$G_ROOTDIR\pfidiag.exe" try_again ! IfFileExists "$G_ROOTDIR\pfimsgcapture.exe" 0 continue try_again: Sleep 1000 Delete "$G_ROOTDIR\msgcapture.exe" + Delete "$G_ROOTDIR\pfidbstatus.exe" + Delete "$G_ROOTDIR\pfidiag.exe" Delete "$G_ROOTDIR\pfimsgcapture.exe" Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** adduser-Version.nsh 11 Aug 2005 11:28:44 -0000 1.5 --- adduser-Version.nsh 12 Aug 2005 12:58:23 -0000 1.6 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.73" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.74" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** adduser.nsi 11 Aug 2005 11:28:44 -0000 1.77 --- adduser.nsi 12 Aug 2005 12:58:23 -0000 1.78 *************** *** 1053,1056 **** --- 1053,1064 ---- "$G_ROOTDIR\runsqlite.exe" "${L_TEMP}" + ; If the 'POPFile SQlite Database Status Check' utility has been installed, create a + ; a shortcut to make it easy to check the integrity of the SQLite database. + + IfFileExists "$G_ROOTDIR\pfidbstatus.exe" 0 stopwords + SetFileAttributes "$G_USERDIR\Check database status.lnk" NORMAL + CreateShortCut "$G_USERDIR\Check database status.lnk" \ + "$G_ROOTDIR\pfidbstatus.exe" "${L_TEMP}" + stopwords: IfFileExists "$G_ROOTDIR\pfi-stopwords.default" 0 update_config_ports *************** *** 1233,1237 **** pfidiag_entries: ! IfFileExists "$G_ROOTDIR\pfidiag.exe" 0 silent_shutdown Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\PFI Diagnostic utility.lnk" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" NORMAL --- 1241,1245 ---- pfidiag_entries: ! IfFileExists "$G_ROOTDIR\pfidiag.exe" 0 dbstatus_check Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\PFI Diagnostic utility.lnk" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" NORMAL *************** *** 1245,1248 **** --- 1253,1272 ---- "$G_ROOTDIR\pfidiag.exe" "/shortcut" + dbstatus_check: + IfFileExists "$G_ROOTDIR\pfidbstatus.exe" 0 silent_shutdown + Push $G_USERDIR + Call PFI_GetSQLdbPathName + Pop ${L_TEMP} + StrCmp ${L_TEMP} "Not SQLite" silent_shutdown + + ; POPFile is configured to use SQLite so we can create a shortcut to the + ; 'POPFile SQLite Database Status Check' utility to make it easy to check + ; the integrity of the current user's SQLite database + + SetOutPath "$G_ROOTDIR" + SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\Check database status.lnk" NORMAL + CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\Check database status.lnk" \ + "$G_ROOTDIR\pfidbstatus.exe" "/REGISTRY" + silent_shutdown: SetOutPath "$G_ROOTDIR" |
