[init] 修改大量代码

Public/lib/wdd-lib-sys.sh

@@ -1,20 +1,25 @@
 #!/bin/bash
 
-if [[ ! -f /root/wdd/lib/wdd-lib-log.sh ]]; then
-    wget https://oss-s1.107421.xyz/wdd-lib-log.sh -O /root/wdd/lib/wdd-lib-log.sh
-fi
-. /root/wdd/lib/wdd-lib-log.sh
-
+oss_url_prefix="https://oss-s1.107421.xyz"
+octopus_agent_path=/usr/local/etc/octpus-agent/
 
+echo ""
+echo ""
+lib_file_list=(wdd-lib-log.sh)
+for lib_file in ${lib_file_list[@]}; do
+    wget "${oss_url_prefix}/${lib_file}" -qO "${octopus_agent_path}/lib/${lib_file}"
+    echo "加载库文件 < ${octopus_agent_path}/lib/${lib_file}"
+    . "${octopus_agent_path}/lib/${lib_file}"
+done
 
 # 系统相关
 linux_release_version=""
 linux_release=""
-OS_BIT=""
-CMD_INSTALL="apt-get -y -qq install"
-CMD_UPDATE="apt-get -qq update"
-CMD_REMOVE="apt-get -y remove"
-SOFTWARE_UPDATED=0
+os_bit=""
+cmd_install="apt-get -y -qq --allow-downgrades install"
+cmd_update="apt-get -qq update"
+cmd_remove="apt-get -y remove"
+software_updated=0
 
 # 判断命令是否存在
 command_exists() {
@@ -26,7 +31,7 @@ check_root() {
   FunctionStart "判定Root用户！"
   if [[ $EUID != 0 ]]; then
     colorEchoRed "当前非root账号(或没有root权限)，无法继续操作，请更换root账号!"
-    colorEcho ${YELLOW} "使用sudo -命令获取临时root权限（执行后可能会提示输入root密码）"
+    colorEchoYellow "使用sudo -命令获取临时root权限（执行后可能会提示输入root密码）"
     exit 1
   else
     log "当前为root账号 ！"
@@ -42,27 +47,27 @@ check_sys() {
   # local shell_width=$(stty size | awk '{print $2}')
   # SplitLine=$(yes "-" | sed "${shell_width}"'q' | tr -d '\n')
 
-
+  local sys_bit
   sys_bit=$(uname -m)
   case $sys_bit in
     i[36]86)
-      OS_BIT="32"
+      os_bit="32"
       linux_release="386"
       ;;
     x86_64)
-      OS_BIT="64"
+      os_bit="64"
       linux_release="amd64"
       ;;
     *armv6*)
-      OS_BIT="arm"
+      os_bit="arm"
       linux_release="arm6"
       ;;
     *armv7*)
-      OS_BIT="arm"
+      os_bit="arm"
       linux_release="arm7"
       ;;
     *aarch64* | *armv8*)
-      OS_BIT="arm64"
+      os_bit="arm64"
       linux_release="arm64"
       ;;
     *)
@@ -72,7 +77,7 @@ check_sys() {
        " && exit 1
       ;;
   esac
-  log "获取的系统信息如下： OS_BIT => ${OS_BIT} LinuxRelease => $linux_release"
+  log "获取的系统信息如下： OS_BIT => ${os_bit} LinuxRelease => $linux_release"
 
   ## 判定Linux的发行版本
   if [ -f /etc/redhat-release ]; then
@@ -95,19 +100,19 @@ check_sys() {
   log "系统参数信息如下：  LinuxReleaseVersion => $linux_release_version"
 
   # 判断系统的包管理工具  apt, yum, or zypper
-  getPackageManageTool() {
+  get_package_manage_tool() {
     if [[ -n $(command -v apt-get) ]]; then
-      CMD_INSTALL="apt-get -y -qq install"
-      CMD_UPDATE="apt-get -qq update"
-      CMD_REMOVE="apt-get -y remove"
+      cmd_install="apt-get -y -qq install"
+      cmd_update="apt-get -qq update"
+      cmd_remove="apt-get -y remove"
     elif [[ -n $(command -v yum) ]]; then
-      CMD_INSTALL="yum -y -q install"
-      CMD_UPDATE="yum -q makecache"
-      CMD_REMOVE="yum -y remove"
+      cmd_install="yum -y -q install"
+      cmd_update="yum -q makecache"
+      cmd_remove="yum -y remove"
     elif [[ -n $(command -v zypper) ]]; then
-      CMD_INSTALL="zypper -y install"
-      CMD_UPDATE="zypper ref"
-      CMD_REMOVE="zypper -y remove"
+      cmd_install="zypper -y install"
+      cmd_update="zypper ref"
+      cmd_remove="zypper -y remove"
     else
       return 1
     fi
@@ -115,20 +120,27 @@ check_sys() {
   }
 
   # 检查系统包管理方式，更新包
-  getPackageManageTool
+  get_package_manage_tool
   if [[ $? -eq 1 ]]; then
     error "系统的包管理不是 APT or YUM, 请手动安装所需要的软件."
     return 1
   fi
 
-  log "系统包管理工具为 =>  $CMD_INSTALL"
+  log "系统包管理工具为 =>  $cmd_install"
 
   ### 更新程序引索
-  if [[ $SOFTWARE_UPDATED -eq 0 ]]; then
+  if [[ $software_updated -eq 0 ]]; then
     log "正在更新软件包管理...可能花费较长时间…………"
-    $CMD_UPDATE
-    SOFTWARE_UPDATED=1
+    $cmd_update
+    software_updated=1
   fi
 
   FunctionEnd
-}
+}
+
+# main
+main() {
+    log "sys脚本被调用了！"
+}
+
+main