[GRASS-SVN] r66294 - grass/branches/releasebranch_7_0/mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2015-09-22 08:44:38 -0700 (Tue, 22 Sep 2015)
New Revision: 66294

Modified:
   grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
Log:
GRASS-Installer.nsi.tmpl: sync with trunk regarding g.mkfontcap run during standalone installation

Modified: grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2015-09-22 14:58:12 UTC (rev 66293)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2015-09-22 15:44:38 UTC (rev 66294)
@@ -528,8 +528,14 @@
 	SetOutPath "$INSTALL_DIR"
 	File /r ${PACKAGE_FOLDER}\*.*
 
-	;grant modifying/overwriting fontcap file
-	AccessControl::GrantOnFile "$INSTDIR\etc\fontcap" "(BU)" "GenericRead + GenericWrite + Delete"	
+	;grant $INSTDIR\etc read write accessible and show if succeeded: error if it failed
+	AccessControl::GrantOnFile "$INSTDIR\etc" "(S-1-5-32-545)" "FullAccess"
+	Pop $R0
+	DetailPrint $R0	
+	;grant modifying/overwriting fontcap file and show if succeeded: error if it failed	
+	AccessControl::GrantOnFile "$INSTDIR\etc\fontcap" "(S-1-5-32-545)" "FullAccess"
+	Pop $R0
+	DetailPrint $R0	
 	
 	;create run_gmkfontcap.bat
 	ClearErrors
@@ -579,7 +585,7 @@
 	FileWrite $0 '    <security>$\r$\n'
 	FileWrite $0 '      <requestedPrivileges>$\r$\n'
 	FileWrite $0 '        <requestedExecutionLevel$\r$\n'
-	FileWrite $0 '          level="asInvoker"$\r$\n'
+	FileWrite $0 '          level="requireAdministrator"$\r$\n'
 	FileWrite $0 '          uiAccess="false"/>$\r$\n'
 	FileWrite $0 '        </requestedPrivileges>$\r$\n'
 	FileWrite $0 '       </security>$\r$\n'
@@ -590,6 +596,9 @@
 	
 	;Run g.mkfontcap outside a grass session during installation to catch all fonts
 	ExecWait '"$INSTALL_DIR\etc\run_gmkfontcap.bat"'
+
+	;set $INSTDIR\etc back to read accessible
+	AccessControl::SetOnFile "$INSTDIR\etc" "(S-1-5-32-545)" "GenericRead + GenericExecute"	
 	
 	;Install demolocation into the GIS_DATABASE directory
 	SetOutPath "$GIS_DATABASE\demolocation"