couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woh...@apache.org
Subject [3/4] couchdb-glazier git commit: Set correct install path permissions
Date Wed, 07 Dec 2016 22:37:28 GMT
Set correct install path permissions


Project: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/commit/4b4ce1fb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/tree/4b4ce1fb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-glazier/diff/4b4ce1fb

Branch: refs/heads/master
Commit: 4b4ce1fb3c62298c3f7fbbe13035f6675a65a4e9
Parents: 4a12b87
Author: Joan Touzet <wohali@atypical.net>
Authored: Wed Dec 7 17:27:23 2016 -0500
Committer: Joan Touzet <wohali@atypical.net>
Committed: Wed Dec 7 17:27:23 2016 -0500

----------------------------------------------------------------------
 installer/couchdb.wxs.in | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-glazier/blob/4b4ce1fb/installer/couchdb.wxs.in
----------------------------------------------------------------------
diff --git a/installer/couchdb.wxs.in b/installer/couchdb.wxs.in
index 7ea891c..9cb123d 100644
--- a/installer/couchdb.wxs.in
+++ b/installer/couchdb.wxs.in
@@ -16,7 +16,7 @@
 	<Product Id="4CD776E0-FADF-4831-AF56-E80E39F34CFC"
 		Name="Apache CouchDB"
 		Language="1033"
-		Version="2.0.0"
+		Version="2.0.0.1"
 		Manufacturer="The Apache Software Foundation"
 		UpgradeCode="9449123B-61C4-40DE-AA6C-1BB9AA02EB67">
 
@@ -26,11 +26,24 @@
 			Cabinet="media1.cab"
 			EmbedCab="yes" />
 
+        <!--Permissions-->
+        <PropertyRef Id="WIX_ACCOUNT_LOCALSYSTEM" />
+        <PropertyRef Id="WIX_ACCOUNT_USERS" />
+        <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" />
+
 		<!--Directory structure-->
         <Property Id="ApplicationFolderName" Value="C:\CouchDB" />
 		<Directory Id="TARGETDIR"
 			Name="SourceDir">
-			<Directory Id="APPLICATIONFOLDER" Name="CouchDB" />
+			<Directory Id="APPLICATIONFOLDER" Name="CouchDB">
+               <Component Id="AppFolder_comp" DiskId="1" Guid="C2C4462F-D9AE-4178-9E49-E2A85C256635">
+                  <CreateFolder>
+                     <Permission User="[WIX_ACCOUNT_LOCALSYSTEM]" GenericAll="yes" />
+                     <Permission User="[WIX_ACCOUNT_ADMINISTRATORS]" GenericAll="yes"
/>
+                     <Permission User="[WIX_ACCOUNT_USERS]" GenericRead="yes" GenericExecute="yes"
/>
+                  </CreateFolder>
+               </Component>
+            </Directory>
 			<Directory Id="ProgramMenuFolder">
 				<Directory Id="OurShortcutsDir" Name="Apache CouchDB" />
 			</Directory>
@@ -87,6 +100,7 @@
 			Title="Droplet"
 			Level="1">
 			<ComponentRef Id="CMP_Shortcuts" />
+            <ComponentRef Id="AppFolder_comp" />
 			<ComponentGroupRef Id="CouchDBFilesGroup" />
 		</Feature>
 		


Mime
View raw message