From 127fefcb81cb0bc140884d72b1c750c351213d63 Mon Sep 17 00:00:00 2001 From: Dimuthu Wannipurage Date: Wed, 16 Mar 2022 18:04:51 -0400 Subject: [PATCH] Changing the build directory --- scripts/build.sh | 48 ++++++++++++++++++++--------------------- scripts/log.sh | 12 +++++------ scripts/start-consul.sh | 16 +++++++------- scripts/start-mft.sh | 10 ++++----- scripts/stop-consul.sh | 2 +- scripts/stop-mft.sh | 10 ++++----- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index a9584b08..42f30380 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -18,28 +18,28 @@ # under the License. cd ../ -mvn clean install -rm -rf build -mkdir -p build -cp agent/target/MFT-Agent-0.01-bin.zip build/ -cp controller/target/MFT-Controller-0.01-bin.zip build/ -cp services/resource-service/server/target/Resource-Service-0.01-bin.zip build/ -cp services/secret-service/server/target/Secret-Service-0.01-bin.zip build/ -cp api/service/target/API-Service-0.01-bin.zip build/ -cp scripts/log.sh build/ -cp scripts/start-mft.sh build/ -cp scripts/stop-mft.sh build/ -cp scripts/start-consul.sh build/ -cp scripts/stop-consul.sh build/ -cp command-line/target/mft-command-line-0.01-SNAPSHOT-jar-with-dependencies.jar build/mft-client.jar +#mvn clean install +rm -rf airavata-mft +mkdir -p airavata-mft +cp agent/target/MFT-Agent-0.01-bin.zip airavata-mft/ +cp controller/target/MFT-Controller-0.01-bin.zip airavata-mft/ +cp services/resource-service/server/target/Resource-Service-0.01-bin.zip airavata-mft/ +cp services/secret-service/server/target/Secret-Service-0.01-bin.zip airavata-mft/ +cp api/service/target/API-Service-0.01-bin.zip airavata-mft/ +cp scripts/log.sh airavata-mft/ +cp scripts/start-mft.sh airavata-mft/ +cp scripts/stop-mft.sh airavata-mft/ +cp scripts/start-consul.sh airavata-mft/ +cp scripts/stop-consul.sh airavata-mft/ +cp command-line/target/mft-command-line-0.01-SNAPSHOT-jar-with-dependencies.jar airavata-mft/mft-client.jar -unzip -o build/MFT-Agent-0.01-bin.zip -d build/ -rm build/MFT-Agent-0.01-bin.zip -unzip -o build/MFT-Controller-0.01-bin.zip -d build/ -rm build/MFT-Controller-0.01-bin.zip -unzip -o build/Resource-Service-0.01-bin.zip -d build/ -rm build/Resource-Service-0.01-bin.zip -unzip -o build/Secret-Service-0.01-bin.zip -d build/ -rm build/Secret-Service-0.01-bin.zip -unzip -o build/API-Service-0.01-bin.zip -d build/ -rm build/API-Service-0.01-bin.zip +unzip -o airavata-mft/MFT-Agent-0.01-bin.zip -d airavata-mft/ +rm airavata-mft/MFT-Agent-0.01-bin.zip +unzip -o airavata-mft/MFT-Controller-0.01-bin.zip -d airavata-mft/ +rm airavata-mft/MFT-Controller-0.01-bin.zip +unzip -o airavata-mft/Resource-Service-0.01-bin.zip -d airavata-mft/ +rm airavata-mft/Resource-Service-0.01-bin.zip +unzip -o airavata-mft/Secret-Service-0.01-bin.zip -d airavata-mft/ +rm airavata-mft/Secret-Service-0.01-bin.zip +unzip -o airavata-mft/API-Service-0.01-bin.zip -d airavata-mft/ +rm airavata-mft/API-Service-0.01-bin.zip diff --git a/scripts/log.sh b/scripts/log.sh index b367fc39..50e5a956 100755 --- a/scripts/log.sh +++ b/scripts/log.sh @@ -19,22 +19,22 @@ case $1 in agent) - tail -100f ../build/MFT-Agent-0.01/logs/airavata.log + tail -100f ../airavata-mft/MFT-Agent-0.01/logs/airavata.log ;; resource) - tail -100f ../build/Resource-Service-0.01/logs/airavata.log + tail -100f ../airavata-mft/Resource-Service-0.01/logs/airavata.log ;; secret) - tail -100f ../build/Secret-Service-0.01/logs/airavata.log + tail -100f ../airavata-mft/Secret-Service-0.01/logs/airavata.log ;; api) - tail -100f ../build/API-Service-0.01/logs/airavata.log + tail -100f ../airavata-mft/API-Service-0.01/logs/airavata.log ;; controller) - tail -100f ../build/MFT-Controller-0.01/logs/airavata.log + tail -100f ../airavata-mft/MFT-Controller-0.01/logs/airavata.log ;; consul) - tail -100f ../build/consul/consul.log + tail -100f ../airavata-mft/consul/consul.log ;; -h) echo "Usage: log.sh" diff --git a/scripts/start-consul.sh b/scripts/start-consul.sh index 99370f1a..74a79f24 100755 --- a/scripts/start-consul.sh +++ b/scripts/start-consul.sh @@ -17,17 +17,17 @@ # specific language governing permissions and limitations # under the License. -PID_PATH_NAME="../build/consul/service-pid" -LOG_FILE="../build/consul/consul.log" +PID_PATH_NAME="../airavata-mft/consul/service-pid" +LOG_FILE="../airavata-mft/consul/consul.log" case $1 in mac) if [ ! -f $PID_PATH_NAME ]; then - mkdir -p ../build/consul + mkdir -p ../airavata-mft/consul curl -O https://releases.hashicorp.com/consul/1.7.1/consul_1.7.1_darwin_amd64.zip - unzip -o consul_1.7.1_darwin_amd64.zip -d ../build/consul + unzip -o consul_1.7.1_darwin_amd64.zip -d ../airavata-mft/consul rm consul_1.7.1_darwin_amd64.zip - nohup ../build/consul/consul agent -dev > $LOG_FILE 2>&1 & + nohup ../airavata-mft/consul/consul agent -dev > $LOG_FILE 2>&1 & echo $! > $PID_PATH_NAME echo "Consul started" else @@ -36,11 +36,11 @@ case $1 in ;; linux) if [ ! -f $PID_PATH_NAME ]; then - mkdir -p ../build/consul + mkdir -p ../airavata-mft/consul curl -O https://releases.hashicorp.com/consul/1.7.1/consul_1.7.1_linux_amd64.zip - unzip -o consul_1.7.1_linux_amd64.zip -d ../build/consul + unzip -o consul_1.7.1_linux_amd64.zip -d ../airavata-mft/consul rm consul_1.7.1_linux_amd64.zip - nohup ../build/consul/consul agent -dev > $LOG_FILE 2>&1 & + nohup ../airavata-mft/consul/consul agent -dev > $LOG_FILE 2>&1 & echo $! > $PID_PATH_NAME echo "Consul started" else diff --git a/scripts/start-mft.sh b/scripts/start-mft.sh index 9522ab66..64215ddc 100755 --- a/scripts/start-mft.sh +++ b/scripts/start-mft.sh @@ -17,8 +17,8 @@ # specific language governing permissions and limitations # under the License. -./../build/API-Service-0.01/bin/api-service-daemon.sh start -./../build/MFT-Controller-0.01/bin/controller-daemon.sh start -./../build/Resource-Service-0.01/bin/resource-service-daemon.sh start -./../build/Secret-Service-0.01/bin/secret-service-daemon.sh start -./../build/MFT-Agent-0.01/bin/agent-daemon.sh start \ No newline at end of file +./../airavata-mft/API-Service-0.01/bin/api-service-daemon.sh start +./../airavata-mft/MFT-Controller-0.01/bin/controller-daemon.sh start +./../airavata-mft/Resource-Service-0.01/bin/resource-service-daemon.sh start +./../airavata-mft/Secret-Service-0.01/bin/secret-service-daemon.sh start +./../airavata-mft/MFT-Agent-0.01/bin/agent-daemon.sh start \ No newline at end of file diff --git a/scripts/stop-consul.sh b/scripts/stop-consul.sh index bcc8654a..c4958937 100755 --- a/scripts/stop-consul.sh +++ b/scripts/stop-consul.sh @@ -17,7 +17,7 @@ # specific language governing permissions and limitations # under the License. -PID_PATH_NAME="../build/consul/service-pid" +PID_PATH_NAME="../airavata-mft/consul/service-pid" if [ -f $PID_PATH_NAME ]; then PID=$(cat $PID_PATH_NAME); diff --git a/scripts/stop-mft.sh b/scripts/stop-mft.sh index 2061cc09..f9110ecf 100755 --- a/scripts/stop-mft.sh +++ b/scripts/stop-mft.sh @@ -17,8 +17,8 @@ # specific language governing permissions and limitations # under the License. -./../build/API-Service-0.01/bin/api-service-daemon.sh stop -./../build/MFT-Controller-0.01/bin/controller-daemon.sh stop -./../build/Resource-Service-0.01/bin/resource-service-daemon.sh stop -./../build/Secret-Service-0.01/bin/secret-service-daemon.sh stop -./../build/MFT-Agent-0.01/bin/agent-daemon.sh stop \ No newline at end of file +./../airavata-mft/API-Service-0.01/bin/api-service-daemon.sh stop +./../airavata-mft/MFT-Controller-0.01/bin/controller-daemon.sh stop +./../airavata-mft/Resource-Service-0.01/bin/resource-service-daemon.sh stop +./../airavata-mft/Secret-Service-0.01/bin/secret-service-daemon.sh stop +./../airavata-mft/MFT-Agent-0.01/bin/agent-daemon.sh stop \ No newline at end of file