[Octave-cvsupdate] octave-forge/admin/Windows/msvc octave_package.nsi.in, 1.3, 1.4

[Michael G. <gof...@us...>]

Update of /cvsroot/octave/octave-forge/admin/Windows/msvc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13060

Modified Files:
	octave_package.nsi.in 
Log Message:
allow silent execution of single-package installers

Index: octave_package.nsi.in
===================================================================
RCS file: /cvsroot/octave/octave-forge/admin/Windows/msvc/octave_package.nsi.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- octave_package.nsi.in	18 Jul 2007 15:32:53 -0000	1.3
+++ octave_package.nsi.in	18 Jul 2007 15:44:22 -0000	1.4
@@ -74,6 +74,7 @@
   FileWrite $0 " "
   FileClose $0
 rebuild:
+  IfSilent +2
   ExecWait '"$OCTAVE_EXEC" -qf --eval "pkg rebuild ${PACKAGE_NAME}"'
 SectionEnd
 
@@ -102,6 +103,7 @@
 !macroend
 
 Function .onInit
+  IfSilent endinit
   ReadRegStr $INSTDIR ${PRODUCT_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" Path
   StrCmp $INSTDIR "" 0 octave_present
   !insertmacro MissingComponent "Octave ${OCTAVE_VERSION}"
@@ -258,7 +260,9 @@
   Exch $0
   Push $2
   Push $3
+  IfSilent dep_ok
   FindFirst $2 $3 "$INSTDIR\share\octave\packages\$0-*"
+  FindClose $2
   StrCmp $3 "" dep_not_ok
   StrCmp $1 "" dep_ok
   ${WordFind} "$3" "-" "-1" $3
@@ -288,7 +292,6 @@
 dep_ok:
   StrCpy $1 1
 done:
-  FindClose $2
   Pop $3
   Pop $2
   Pop $0