From a27eedc22d66f31811f77f66aee5786c98187171 Mon Sep 17 00:00:00 2001
From: AhFei <vgamebox@outlook.com>
Date: Wed, 18 Oct 2023 23:25:25 +0800
Subject: [PATCH] set password and delete useless lines

---
 initial.sh | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/initial.sh b/initial.sh
index ba11b6b..30b1aed 100644
--- a/initial.sh
+++ b/initial.sh
@@ -9,13 +9,11 @@ nml_user_name=${1}
 nml_user_home=${2}
 ss_user_name=${3}
 new_port=${4}
-test_or_not=${5}
+password=${5}
+test_or_not=${6}
 
 SSHCONF="/etc/ssh/sshd_config"   # sshd配置文件位置
 
-github_project="docker/compose"   # 自动获取 docker compose 最新下载地址
-tag=$(wget -qO- -t1 -T2 "https://api.github.com/repos/${github_project}/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
-
 
 # step 1: install
 echo "net.core.default_qdisc=fq" >> /etc/sysctl.conf   #修改系统变量
@@ -23,20 +21,20 @@ echo "net.ipv4.tcp_congestion_control=bbr" >> /etc/sysctl.conf   #修改系统
 sysctl -p   #保存生效
 sysctl net.ipv4.tcp_available_congestion_control   #执行
 
-apt update
-apt -y install sudo curl vim git
+apt-get update
+apt-get install -y sudo curl vim git
 for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done
 curl -fsSL https://get.docker.com | bash
 echo "step 1: install has finished"
 
 
 # step 2: localize
-useradd -d /home/${nml_user_home} -m ${nml_user_name}
-usermod -s /bin/bash ${nml_user_name}
+useradd -md /home/${nml_user_home} -s /bin/bash ${nml_user_name}
 usermod -aG sudo ${nml_user_name}   # 有些发行版 RN 的就没有sudo adm
 usermod -aG adm ${nml_user_name}
 usermod -aG docker ${nml_user_name}
-echo `groups ${nml_user_name}`
+# set password
+echo ${password} | passwd --stdin ${nml_user_name}
 
 # 修改ssh端口和禁止root登陆
 cp ${SSHCONF} ${SSHCONF}.bak
@@ -70,12 +68,6 @@ fi
 # step 4: test cpu net etc
 echo 1 | bash <(wget -qO- --no-check-certificate https://github.com/spiritLHLS/ecs/raw/main/ecs.sh)
 
-# Geekbench 5 测试
-# wget https://cdn.geekbench.com/Geekbench-5.4.5-Linux.tar.gz && \
-# tar -xzvf Geekbench-*.tar.gz && rm Geekbench-*.tar.gz && \
-# mv Geek*/* ./  && rmdir Geekbench-* && \
-# echo "now geekbench5!"
-# ./geekbench5 > result_geekbench5.txt
 
 docker run -d -e MODE=standalone -p 80:80 -it --name speedtest adolfintel/speedtest:latest