You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/06/15 15:24:49 UTC

[incubator-iotdb] branch rel/0.10 updated: grant sbin/* tools/* conf/*.sh exectuable permission

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/rel/0.10 by this push:
     new bf317bc  grant sbin/*  tools/* conf/*.sh  exectuable permission
     new 3586820  Merge branch 'rel/0.10' of github.com:apache/incubator-iotdb into rel/0.10
bf317bc is described below

commit bf317bcb4834067cc3dd07f45eb7943230e50259
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Jun 15 23:04:57 2020 +0800

    grant sbin/*  tools/* conf/*.sh  exectuable permission
---
 distribution/src/assembly/distribution.xml | 40 ++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/distribution/src/assembly/distribution.xml b/distribution/src/assembly/distribution.xml
index 3208793..f829ae0 100644
--- a/distribution/src/assembly/distribution.xml
+++ b/distribution/src/assembly/distribution.xml
@@ -43,8 +43,38 @@
             <unpack>false</unpack>
         </dependencySet>
     </dependencySets>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>sbin</outputDirectory>
+            <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/sbin</directory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <outputDirectory>tools</outputDirectory>
+            <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/tools</directory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <outputDirectory>sbin</outputDirectory>
+            <directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/sbin</directory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/licenses</directory>
+            <outputDirectory>licenses</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${maven.multiModuleProjectDirectory}/docs</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+    </fileSets>
     <files>
         <file>
+            <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/iotdb-env.sh</source>
+            <destName>conf/iotdb-env.sh</destName>
+            <fileMode>0755</fileMode>
+        </file>
+        <file>
             <source>${maven.multiModuleProjectDirectory}/README.md</source>
         </file>
         <file>
@@ -66,14 +96,4 @@
             <destName>tools/grafana/application.properties</destName>
         </file>
     </files>
-    <fileSets>
-        <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/licenses</directory>
-            <outputDirectory>licenses</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>${maven.multiModuleProjectDirectory}/docs</directory>
-            <outputDirectory>docs</outputDirectory>
-        </fileSet>
-    </fileSets>
 </assembly>