From 5b6ca2e4630281393cc456ae7e060f70e9b6e197 Mon Sep 17 00:00:00 2001
From: IceDerce <zeaslity@qq.com>
Date: Thu, 22 Dec 2022 22:07:38 +0800
Subject: [PATCH] [ agent ] [ boot ] - agent boot up procedure - 14

---
 .../src/main/java/io/wdd/source/shell/agent-bootup.sh  |  2 +-
 .../main/java/io/wdd/source/shell/lib/wdd-lib-env.sh   | 10 ++++++++--
 .../main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh   |  6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh
index 8106afa..69d715c 100644
--- a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh
+++ b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh
@@ -122,7 +122,7 @@ check_sys() {
 
   # 判断系统的包管理工具  apt, yum, or zypper
   getPackageManageTool() {
-    if [[ -n $(command -v apt-getMapper) ]]; then
+    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"
diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
index d288a55..015819b 100644
--- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
+++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
@@ -259,7 +259,7 @@ if [[ $(cat /etc/hostname | cut -d"-" -f 3 | grep -c '^[0-9][0-9]') -gt 0 ]]; th
 else
     machineNumber=99
 fi
-
+cat >>/etc/environment<<EOF
 export serverName="${city}-${hostArch}-${machineNumber}"
 export serverIpPbV4="$public_ipv4"
 export serverIpInV4=""
@@ -279,5 +279,11 @@ export osKernelInfo="$kern"
 export tcpControl="$tcpctrl"
 export virtualization="$virt"
 export ioSpeed="$ioavg MB/s"
-export machineId="$(cat /host/etc/machine-id)"
+export machineId="$(cat /etc/machine-id)"
+EOF
+
+log "env collect complete!"
+source /etc/environment
+
+env
 
diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh
index d65fff6..6fd90bf 100644
--- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh
+++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh
@@ -40,7 +40,7 @@ check_sys() {
     hostArch="arm64"
     ;;
   *)
-    colorEcho ${RED} "
+    error "
        哈哈……这个 辣鸡脚本 不支持你的系统。 (-_-) \n
        备注: 仅支持 Ubuntu 16+ / Debian 8+ / CentOS 7+ 系统
        " && exit 1
@@ -88,7 +88,7 @@ check_sys() {
   # 检查系统包管理方式，更新包
   getPackageManageTool
   if [[ $? -eq 1 ]]; then
-    colorEcho ${RED} "系统的包管理不是 APT or YUM, 请手动安装所需要的软件."
+    error "系统的包管理不是 APT or YUM, 请手动安装所需要的软件."
     return 1
   fi
 
@@ -101,7 +101,7 @@ tmp () {
 gcloud compute instances create octopus-agent-2c-4g-1 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --metadata=startup-script=wget\ https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell/agent-bootup.sh\ \&\&\ chmod\ \+x\ agent-bootup.sh\ \&\&\ /bin/bash\ agent-bootup.sh --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any
 
 
-gcloud compute instances delete octopus-agent-2c-4g-1 --project=compact-lacing-371804 --zone=asia-northeast1-b
+gcloud compute instances delete octopus-agent-2c-4g-7 --project=compact-lacing-371804 --zone=asia-northeast1-b
 
 
 gcloud compute instances create octopus-agent-2c-4g-7 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default  --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any