[incubator-inlong] branch master updated: --other=merge prepare_env.sh into dataproxy-start.sh，as `sh prepare_env.sh` may be forgot by a inlong beginner (#2127)

[do...@apache.org]

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

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c2c072  --other=merge prepare_env.sh into dataproxy-start.sh，as `sh prepare_env.sh` may be forgot by a inlong beginner (#2127)
6c2c072 is described below

commit 6c2c0724b1f38095a93cb6b653257f8cc8501a44
Author: Liao Rui <li...@users.noreply.github.com>
AuthorDate: Tue Jan 11 15:16:25 2022 +0800

    --other=merge prepare_env.sh into dataproxy-start.sh，as `sh prepare_env.sh` may be forgot by a inlong beginner (#2127)
    
    Co-authored-by: ryanrliao <ry...@tencent.com>
---
 inlong-dataproxy/bin/dataproxy-start.sh | 11 ++++++++++-
 inlong-dataproxy/bin/prepare_env.sh     | 27 ---------------------------
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/inlong-dataproxy/bin/dataproxy-start.sh b/inlong-dataproxy/bin/dataproxy-start.sh
index 34a8fa1..15ebb9f 100755
--- a/inlong-dataproxy/bin/dataproxy-start.sh
+++ b/inlong-dataproxy/bin/dataproxy-start.sh
@@ -18,6 +18,15 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-cd "$(dirname "$0")"/../
+cd "$(dirname "$0")"/../conf || exit
+
+for i in {mx.properties,transfer.properties,weight.properties,common.properties,blacklist.properties,groupid_mapping.properties,dc_mapping.properties,topics.properties,tube_switch.properties}
+do
+  if [ ! -f "$i" ]; then
+    touch "$i"
+  fi
+done
+
+cd .. || exit
 chmod 777 bin/flume-ng
 nohup bin/flume-ng agent --conf conf/ -f conf/flume.conf -n agent1 --no-reload-conf  > dataproxy.log 2>&1 &
\ No newline at end of file
diff --git a/inlong-dataproxy/bin/prepare_env.sh b/inlong-dataproxy/bin/prepare_env.sh
deleted file mode 100755
index 7883b4e..0000000
--- a/inlong-dataproxy/bin/prepare_env.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-cd "$(dirname "$0")"/../conf
-
-for i in {mx.properties,transfer.properties,weight.properties,common.properties,blacklist.properties,groupid_mapping.properties,dc_mapping.properties,topics.properties,tube_switch.properties}
-  do
-    touch $i
-done
\ No newline at end of file