This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 4b614027d Consistently invoke bash with /usr/bin/env bash in scripts
to make code more portable (#3608)
4b614027d is described below
commit 4b614027df5e9027bb05c5a56d12a7568c05d74d
Author: huangxiaoping <[email protected]>
AuthorDate: Tue Oct 11 14:18:24 2022 +0800
Consistently invoke bash with /usr/bin/env bash in scripts to make code
more portable (#3608)
---
.../apache/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala | 2 +-
linkis-dist/bin/checkEnv.sh | 2 +-
linkis-dist/bin/common.sh | 2 +-
linkis-dist/bin/install.sh | 2 +-
linkis-dist/deploy-config/db.sh | 2 +-
linkis-dist/deploy-config/linkis-env.sh | 2 +-
linkis-dist/docker/scripts/entry-point-ldh.sh | 2 +-
linkis-dist/docker/scripts/prepare-ldh-image.sh | 2 +-
linkis-dist/helm/scripts/common.sh | 2 +-
linkis-dist/helm/scripts/create-kind-cluster.sh | 2 +-
linkis-dist/helm/scripts/install-charts.sh | 2 +-
linkis-dist/helm/scripts/install-ldh.sh | 2 +-
linkis-dist/helm/scripts/install-mysql.sh | 2 +-
linkis-dist/helm/scripts/login-pod.sh | 2 +-
linkis-dist/helm/scripts/remote-debug-proxy.sh | 2 +-
linkis-dist/package/bin/linkis-cli | 2 +-
linkis-dist/package/bin/linkis-cli-hive | 2 +-
linkis-dist/package/bin/linkis-cli-pre | 2 +-
linkis-dist/package/bin/linkis-cli-spark-sql | 2 +-
linkis-dist/package/bin/linkis-cli-spark-submit | 2 +-
linkis-dist/package/bin/linkis-cli-sqoop | 2 +-
linkis-dist/package/sbin/common.sh | 2 +-
linkis-dist/package/sbin/ext/linkis-cg-engineconnmanager | 2 +-
linkis-dist/package/sbin/ext/linkis-cg-engineplugin | 2 +-
linkis-dist/package/sbin/ext/linkis-cg-entrance | 2 +-
linkis-dist/package/sbin/ext/linkis-cg-linkismanager | 2 +-
linkis-dist/package/sbin/ext/linkis-common-start | 2 +-
linkis-dist/package/sbin/ext/linkis-mg-eureka | 2 +-
linkis-dist/package/sbin/ext/linkis-mg-gateway | 2 +-
linkis-dist/package/sbin/ext/linkis-ps-publicservice | 2 +-
linkis-dist/package/sbin/graceful-upgrade.sh | 2 +-
linkis-dist/package/sbin/kill-process-by-pid.sh | 2 +-
linkis-dist/package/sbin/linkis-daemon.sh | 2 +-
linkis-dist/package/sbin/linkis-start-all.sh | 2 +-
linkis-dist/package/sbin/linkis-stop-all.sh | 2 +-
linkis-web/config.sh | 2 +-
linkis-web/install.sh | 4 ++--
tool/modify_license.sh | 2 +-
38 files changed, 39 insertions(+), 39 deletions(-)
diff --git
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala
index a9fa8ea93..eeb976bfa 100644
---
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala
+++
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala
@@ -66,7 +66,7 @@ abstract class ShellProcessEngineCommandBuilder extends
ProcessEngineCommandBuil
class UnixProcessEngineCommandBuilder extends ShellProcessEngineCommandBuilder
{
- newLine("#!/bin/bash")
+ newLine("#!/usr/bin/env bash")
if (ECPCoreConf.CORE_DUMP_DISABLE) {
newLine("ulimit -c 0")
diff --git a/linkis-dist/bin/checkEnv.sh b/linkis-dist/bin/checkEnv.sh
index 1acd53f98..b267fbdd4 100644
--- a/linkis-dist/bin/checkEnv.sh
+++ b/linkis-dist/bin/checkEnv.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/bin/common.sh b/linkis-dist/bin/common.sh
index f6f2f7a24..be1717156 100644
--- a/linkis-dist/bin/common.sh
+++ b/linkis-dist/bin/common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/bin/install.sh b/linkis-dist/bin/install.sh
index 4154d62bf..165be6aad 100644
--- a/linkis-dist/bin/install.sh
+++ b/linkis-dist/bin/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/deploy-config/db.sh b/linkis-dist/deploy-config/db.sh
index 2da3d5f6e..64cbb167d 100644
--- a/linkis-dist/deploy-config/db.sh
+++ b/linkis-dist/deploy-config/db.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/deploy-config/linkis-env.sh
b/linkis-dist/deploy-config/linkis-env.sh
index 857fca76f..e2dbaf925 100644
--- a/linkis-dist/deploy-config/linkis-env.sh
+++ b/linkis-dist/deploy-config/linkis-env.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/docker/scripts/entry-point-ldh.sh
b/linkis-dist/docker/scripts/entry-point-ldh.sh
index 252f34498..497a73471 100644
--- a/linkis-dist/docker/scripts/entry-point-ldh.sh
+++ b/linkis-dist/docker/scripts/entry-point-ldh.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/docker/scripts/prepare-ldh-image.sh
b/linkis-dist/docker/scripts/prepare-ldh-image.sh
index dce3f8fde..d8d9b99ef 100755
--- a/linkis-dist/docker/scripts/prepare-ldh-image.sh
+++ b/linkis-dist/docker/scripts/prepare-ldh-image.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/helm/scripts/common.sh
b/linkis-dist/helm/scripts/common.sh
index 596b0dd88..546cf2ebe 100755
--- a/linkis-dist/helm/scripts/common.sh
+++ b/linkis-dist/helm/scripts/common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/helm/scripts/create-kind-cluster.sh
b/linkis-dist/helm/scripts/create-kind-cluster.sh
index a804b6c4b..70ffd22ab 100755
--- a/linkis-dist/helm/scripts/create-kind-cluster.sh
+++ b/linkis-dist/helm/scripts/create-kind-cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/helm/scripts/install-charts.sh
b/linkis-dist/helm/scripts/install-charts.sh
index 9f25a433e..1a245f389 100755
--- a/linkis-dist/helm/scripts/install-charts.sh
+++ b/linkis-dist/helm/scripts/install-charts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/helm/scripts/install-ldh.sh
b/linkis-dist/helm/scripts/install-ldh.sh
index 9736b4c7a..128a316a3 100755
--- a/linkis-dist/helm/scripts/install-ldh.sh
+++ b/linkis-dist/helm/scripts/install-ldh.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/helm/scripts/install-mysql.sh
b/linkis-dist/helm/scripts/install-mysql.sh
index 208d09407..acb1be725 100755
--- a/linkis-dist/helm/scripts/install-mysql.sh
+++ b/linkis-dist/helm/scripts/install-mysql.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/helm/scripts/login-pod.sh
b/linkis-dist/helm/scripts/login-pod.sh
index 1bb391928..ad92c7216 100755
--- a/linkis-dist/helm/scripts/login-pod.sh
+++ b/linkis-dist/helm/scripts/login-pod.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/helm/scripts/remote-debug-proxy.sh
b/linkis-dist/helm/scripts/remote-debug-proxy.sh
index 7115e779c..1fcc79efc 100755
--- a/linkis-dist/helm/scripts/remote-debug-proxy.sh
+++ b/linkis-dist/helm/scripts/remote-debug-proxy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/bin/linkis-cli
b/linkis-dist/package/bin/linkis-cli
index 2c15cf674..dfc9026e5 100644
--- a/linkis-dist/package/bin/linkis-cli
+++ b/linkis-dist/package/bin/linkis-cli
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/bin/linkis-cli-hive
b/linkis-dist/package/bin/linkis-cli-hive
index 9bfc41698..31ef0c54f 100644
--- a/linkis-dist/package/bin/linkis-cli-hive
+++ b/linkis-dist/package/bin/linkis-cli-hive
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/bin/linkis-cli-pre
b/linkis-dist/package/bin/linkis-cli-pre
index 427323224..868bdbebe 100644
--- a/linkis-dist/package/bin/linkis-cli-pre
+++ b/linkis-dist/package/bin/linkis-cli-pre
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/bin/linkis-cli-spark-sql
b/linkis-dist/package/bin/linkis-cli-spark-sql
index 4694dc463..8a8b58ea7 100644
--- a/linkis-dist/package/bin/linkis-cli-spark-sql
+++ b/linkis-dist/package/bin/linkis-cli-spark-sql
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/bin/linkis-cli-spark-submit
b/linkis-dist/package/bin/linkis-cli-spark-submit
index 583189057..2ae230466 100644
--- a/linkis-dist/package/bin/linkis-cli-spark-submit
+++ b/linkis-dist/package/bin/linkis-cli-spark-submit
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/bin/linkis-cli-sqoop
b/linkis-dist/package/bin/linkis-cli-sqoop
index 27fca1aec..9d516996c 100644
--- a/linkis-dist/package/bin/linkis-cli-sqoop
+++ b/linkis-dist/package/bin/linkis-cli-sqoop
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/common.sh
b/linkis-dist/package/sbin/common.sh
index 4278507f9..268bdfe28 100644
--- a/linkis-dist/package/sbin/common.sh
+++ b/linkis-dist/package/sbin/common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-cg-engineconnmanager
b/linkis-dist/package/sbin/ext/linkis-cg-engineconnmanager
index 025190f10..403d76c35 100644
--- a/linkis-dist/package/sbin/ext/linkis-cg-engineconnmanager
+++ b/linkis-dist/package/sbin/ext/linkis-cg-engineconnmanager
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-cg-engineplugin
b/linkis-dist/package/sbin/ext/linkis-cg-engineplugin
index 460bf1556..fd9a59718 100644
--- a/linkis-dist/package/sbin/ext/linkis-cg-engineplugin
+++ b/linkis-dist/package/sbin/ext/linkis-cg-engineplugin
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-cg-entrance
b/linkis-dist/package/sbin/ext/linkis-cg-entrance
index 43281281c..3dd96ded6 100644
--- a/linkis-dist/package/sbin/ext/linkis-cg-entrance
+++ b/linkis-dist/package/sbin/ext/linkis-cg-entrance
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-cg-linkismanager
b/linkis-dist/package/sbin/ext/linkis-cg-linkismanager
index 1418ba6c3..40a9b17c0 100644
--- a/linkis-dist/package/sbin/ext/linkis-cg-linkismanager
+++ b/linkis-dist/package/sbin/ext/linkis-cg-linkismanager
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-common-start
b/linkis-dist/package/sbin/ext/linkis-common-start
index c93ce958c..3651d71e8 100644
--- a/linkis-dist/package/sbin/ext/linkis-common-start
+++ b/linkis-dist/package/sbin/ext/linkis-common-start
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-mg-eureka
b/linkis-dist/package/sbin/ext/linkis-mg-eureka
index f89a5bc04..6beb502d5 100644
--- a/linkis-dist/package/sbin/ext/linkis-mg-eureka
+++ b/linkis-dist/package/sbin/ext/linkis-mg-eureka
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-mg-gateway
b/linkis-dist/package/sbin/ext/linkis-mg-gateway
index bc51387bd..49defda0b 100644
--- a/linkis-dist/package/sbin/ext/linkis-mg-gateway
+++ b/linkis-dist/package/sbin/ext/linkis-mg-gateway
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/ext/linkis-ps-publicservice
b/linkis-dist/package/sbin/ext/linkis-ps-publicservice
index eb75f9d2e..6ab965226 100644
--- a/linkis-dist/package/sbin/ext/linkis-ps-publicservice
+++ b/linkis-dist/package/sbin/ext/linkis-ps-publicservice
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/graceful-upgrade.sh
b/linkis-dist/package/sbin/graceful-upgrade.sh
index 233d86fb5..496779709 100644
--- a/linkis-dist/package/sbin/graceful-upgrade.sh
+++ b/linkis-dist/package/sbin/graceful-upgrade.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/kill-process-by-pid.sh
b/linkis-dist/package/sbin/kill-process-by-pid.sh
index aff0efea4..eea93d03b 100644
--- a/linkis-dist/package/sbin/kill-process-by-pid.sh
+++ b/linkis-dist/package/sbin/kill-process-by-pid.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/linkis-daemon.sh
b/linkis-dist/package/sbin/linkis-daemon.sh
index 91a328796..4bb96aace 100755
--- a/linkis-dist/package/sbin/linkis-daemon.sh
+++ b/linkis-dist/package/sbin/linkis-daemon.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/linkis-start-all.sh
b/linkis-dist/package/sbin/linkis-start-all.sh
index 7f83581f1..047cc34e8 100644
--- a/linkis-dist/package/sbin/linkis-start-all.sh
+++ b/linkis-dist/package/sbin/linkis-start-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-dist/package/sbin/linkis-stop-all.sh
b/linkis-dist/package/sbin/linkis-stop-all.sh
index baa93dd85..9e7b13f0a 100644
--- a/linkis-dist/package/sbin/linkis-stop-all.sh
+++ b/linkis-dist/package/sbin/linkis-stop-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-web/config.sh b/linkis-web/config.sh
index 7a4448bb8..f0b9578dc 100644
--- a/linkis-web/config.sh
+++ b/linkis-web/config.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/linkis-web/install.sh b/linkis-web/install.sh
index 4347999e7..e2b0eadcb 100644
--- a/linkis-web/install.sh
+++ b/linkis-web/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -89,7 +89,7 @@ linkisConf(){
server_name localhost;
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
-
+
location / {
root ${linkis_basepath}/dist; #static directory
index index.html index.html;
diff --git a/tool/modify_license.sh b/tool/modify_license.sh
index 8f4f270d5..2f0213cc9 100644
--- a/tool/modify_license.sh
+++ b/tool/modify_license.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
