From 8f10f45e4c74abd2dc1fa0cd8249b7474a62b0e7 Mon Sep 17 00:00:00 2001
From: huanghaiquan <huanghaiquan@jd.com>
Date: Fri, 6 Mar 2020 23:51:00 +0800
Subject: [PATCH] fixed bugs in startup scripts and packaging manifests;

---
 deploy/deploy-gateway/src/main/resources/assembly.xml         | 2 +-
 deploy/deploy-gateway/src/main/resources/scripts/startup.sh   | 2 +-
 deploy/deploy-peer/src/main/resources/assembly.xml            | 2 +-
 deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/deploy-gateway/src/main/resources/assembly.xml b/deploy/deploy-gateway/src/main/resources/assembly.xml
index 861990d0..b28d5436 100644
--- a/deploy/deploy-gateway/src/main/resources/assembly.xml
+++ b/deploy/deploy-gateway/src/main/resources/assembly.xml
@@ -31,7 +31,7 @@
             <useProjectArtifact>true</useProjectArtifact>
             <outputDirectory>lib</outputDirectory>
             <includes>
-            	<include>com.jd.blockchain:deployment-gateway</include>
+            	<include>com.jd.blockchain:deploy-gateway</include>
             </includes>
         </dependencySet>
     </dependencySets>
diff --git a/deploy/deploy-gateway/src/main/resources/scripts/startup.sh b/deploy/deploy-gateway/src/main/resources/scripts/startup.sh
index 62272d19..01c86077 100644
--- a/deploy/deploy-gateway/src/main/resources/scripts/startup.sh
+++ b/deploy/deploy-gateway/src/main/resources/scripts/startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 HOME=$(cd `dirname $0`;cd ../; pwd)
-GATEWAY=$(ls $HOME/lib | grep deployment-gateway-)
+GATEWAY=$(ls $HOME/lib | grep deploy-gateway-)
 PROC_INFO=$HOME/lib/$GATEWAY" -c "$HOME/config/gateway.conf
 #echo $PROC_INFO
 #get PID
diff --git a/deploy/deploy-peer/src/main/resources/assembly.xml b/deploy/deploy-peer/src/main/resources/assembly.xml
index 37aa494c..18b14057 100644
--- a/deploy/deploy-peer/src/main/resources/assembly.xml
+++ b/deploy/deploy-peer/src/main/resources/assembly.xml
@@ -39,7 +39,7 @@
             	<include>com.jd.blockchain:runtime-modular</include>
             	<include>com.jd.blockchain:runtime-modular-booter</include>
             	<include>com.jd.blockchain:peer</include>
-            	<include>com.jd.blockchain:deployment-peer</include>
+            	<include>com.jd.blockchain:deploy-peer</include>
             </includes>
         </dependencySet>
         <dependencySet>
diff --git a/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh b/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
index 407b30ea..3367c3fc 100644
--- a/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
+++ b/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 HOME=$(cd `dirname $0`;cd ../; pwd)
-PEER=$(ls $HOME/system | grep deployment-peer-)
+PEER=$(ls $HOME/system | grep deploy-peer-)
 PROC_INFO=$HOME/system/$PEER" -home="$HOME" -c "$HOME/config/ledger-binding.conf" -p 7080"
 #echo $PROC_INFO
 #get PID