From 6529d1eb4f0e7177eee30d1c05388ae67d0532d9 Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Thu, 17 Aug 2023 14:33:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E4=BA=8E=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F=E8=84=9A=E6=9C=AC=E8=B7=AF=E5=BE=84=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E6=9B=B4=E6=94=B9=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 customer/usr/local/bin/common.sh      | 16 ++++++++--------
 customer/usr/local/bin/entry.sh       |  4 ++--
 customer/usr/local/bin/environment.sh |  2 +-
 customer/usr/local/bin/run.sh         |  9 ++++-----
 customer/usr/local/bin/setup.sh       |  6 +++---
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/customer/usr/local/bin/common.sh b/customer/usr/local/bin/common.sh
index d5bad9b..e871859 100644
--- a/customer/usr/local/bin/common.sh
+++ b/customer/usr/local/bin/common.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
-# Ver: 1.1 by Endial Fang (endial@126.com)
+# Ver: 1.2 by Endial Fang (endial@126.com)
 # 
 # 应用通用业务处理函数
 
 # 加载依赖脚本
-. /usr/local/scripts/libcommon.sh       # 通用函数库
+. /colovu/lib/libcommon.sh       # 通用函数库
 
-. /usr/local/scripts/libfile.sh
-. /usr/local/scripts/libfs.sh
-. /usr/local/scripts/liblog.sh
-. /usr/local/scripts/libos.sh
-. /usr/local/scripts/libservice.sh
-. /usr/local/scripts/libvalidations.sh
+. /colovu/lib/libfile.sh
+. /colovu/lib/libfs.sh
+. /colovu/lib/liblog.sh
+. /colovu/lib/libos.sh
+. /colovu/lib/libservice.sh
+. /colovu/lib/libvalidations.sh
 
 # 函数列表
 
diff --git a/customer/usr/local/bin/entry.sh b/customer/usr/local/bin/entry.sh
index 2a72e7c..ad57948 100755
--- a/customer/usr/local/bin/entry.sh
+++ b/customer/usr/local/bin/entry.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Ver: 1.2 by Endial Fang (endial@126.com)
+# Ver: 1.3 by Endial Fang (endial@126.com)
 # 
 # 容器入口脚本
 
@@ -8,7 +8,7 @@
 set -eu
 set -o pipefail
 
-. /usr/local/scripts/libcommon.sh		# 加载通用函数库
+. /colovu/lib/libcommon.sh		# 加载通用函数库
 
 LOG_I "** Processing entry.sh **"
 
diff --git a/customer/usr/local/bin/environment.sh b/customer/usr/local/bin/environment.sh
index 7cb3df5..930a903 100644
--- a/customer/usr/local/bin/environment.sh
+++ b/customer/usr/local/bin/environment.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Ver: 1.0 by Endial Fang (endial@126.com)
+# Ver: 1.1 by Endial Fang (endial@126.com)
 # 
 # 应用环境变量定义及初始化
 
diff --git a/customer/usr/local/bin/run.sh b/customer/usr/local/bin/run.sh
index c37cbe0..3b7475a 100755
--- a/customer/usr/local/bin/run.sh
+++ b/customer/usr/local/bin/run.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Ver: 1.3 by Endial Fang (endial@126.com)
+# Ver: 1.5 by Endial Fang (endial@126.com)
 # 
 # 应用启动脚本
 
@@ -13,14 +13,13 @@ set -o pipefail
 
 LOG_I "** Processing run.sh **"
 
-
 readonly START_COMMAND="$(command -v ${APP_EXEC})"
 
-# 确保应用运行在前台
+# 配置默认启动参数（应用配置文件、前台方式启动）
 flags=("--config-file=${PG_CONF_FILE}" "--hba_file=${PG_HBA_FILE}")
-[[ -z "${APP_EXTRA_FLAGS:-}" ]] || flags=("${flags[@]}" "${APP_EXTRA_FLAGS[@]}")
+[[ -z "${APP_EXTRA_FLAGS:-}" ]] || flags+=("${APP_EXTRA_FLAGS[@]}")
 # 增加 "@" 以使用用户在命令行添加的扩展标识
-flags=("${flags[@]}" "$@")
+flags+=("$@")
 
 LOG_I "** Starting ${APP_NAME} **"
 #is_root && flags=("-u" "$APP_DAEMON_USER" "${flags[@]}")
diff --git a/customer/usr/local/bin/setup.sh b/customer/usr/local/bin/setup.sh
index 45e04a4..42bce69 100755
--- a/customer/usr/local/bin/setup.sh
+++ b/customer/usr/local/bin/setup.sh
@@ -8,9 +8,9 @@
 set -eu
 set -o pipefail
 
-. /usr/local/scripts/libcommon.sh		# 加载通用函数库
-. /usr/local/scripts/libfs.sh			# 加载文件操作函数库
-. /usr/local/scripts/libos.sh			# 加载系统管理函数库
+. /colovu/lib/libcommon.sh		# 加载通用函数库
+. /colovu/lib/libfs.sh			# 加载文件操作函数库
+. /colovu/lib/libos.sh			# 加载系统管理函数库
 
 . /usr/local/bin/environment.sh 		# 设置环境变量