Skip to content

测试分支 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soloxiaoye2022 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

测试分支 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ab3a32
测试分支
soloxiaoye2022 Dec 18, 2023
e367594
Update README.md
soloxiaoye2022 Dec 18, 2023
f64fb0c
Update README.md
soloxiaoye2022 Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ sudo -i #可能需要输入当前用户的密码,如果已经是root用户登录

```bash

bash <(curl -s -L https://raw.githubusercontent.com/soloxiaoye2022/LiteLoaderQQNT-for-Linux_desktop-depoly/main/install_liteloader_qqnt_linux.sh)
bash <(curl -s -L https://raw.githubusercontent.com/soloxiaoye2022/LiteLoaderQQNT-for-Linux_desktop-depoly/test/install_liteloader_qqnt_linux.sh)

```

* 3.国内服务器可使用

```bash

bash <(curl -s -L https://mirror.ghproxy.com/https://raw.githubusercontent.com/soloxiaoye2022/LiteLoaderQQNT-for-Linux_desktop-depoly/main/install_liteloader_qqnt_linux.sh)
bash <(curl -s -L https://mirror.ghproxy.com/https://raw.githubusercontent.com/soloxiaoye2022/LiteLoaderQQNT-for-Linux_desktop-depoly/test/install_liteloader_qqnt_linux.sh)

```

Expand Down
54 changes: 27 additions & 27 deletions install_liteloader_qqnt_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Tip="${Purple_font_prefix}[注意]${Font_color_suffix}"

#检查用户
check_root(){
[[ $EUID != 0 ]] && echo -e "${Error} 当前用户没有ROOT权限，无法继续操作，请使用 ${Green_background_prefix}sudo -i${Font_color_suffix} 命令获取临时ROOT权限,执行后可能会提示输入当前账号的密码。" && exit 1
#|| echo -e "${Error} 当前为root用户，请先切换至sudo用户后输入${Green_background_prefix}sudo -i${Font_color_suffix} 命令获取临时ROOT权限后再运行脚本。" && exit 1
[[ $EUID != 0 ]] && echo -e "${Error} 当前用户没有ROOT权限，无法继续操作，请使用 ${Green_background_prefix}-i${Font_color_suffix} 命令获取临时ROOT权限,执行后可能会提示输入当前账号的密码。" && exit 1
#|| echo -e "${Error} 当前为root用户，请先切换至sudo用户后输入${Green_background_prefix}-i${Font_color_suffix} 命令获取临时ROOT权限后再运行脚本。" && exit 1
if [[ -z "${user}" ]];then
echo -e "${Tip} 可能没有安装桌面环境，或者非sudo用户登录桌面环境，请检查当前环境是否满足条件\n1.桌面环境\n2.sudo用户登录桌面\n3.使用sudo -i获取临时root权限"
echo -e "${Tip} 可能没有安装桌面环境，或者非sudo用户登录桌面环境，请检查当前环境是否满足条件\n1.桌面环境\n2.sudo用户登录桌面\n3.使用-i获取临时root权限"
read -erp "如需继续安装请输入sudo用户名(proot容器请输入root)，否则直接 回车 或者输入 n 退出脚本:" sudo_user
[[ -z "${sudo_user}" ]] || [[ "${sudo_user}" == 'n' ]] && echo -e "${Info} 您已取消操作." && exit 0
echo -e "${Info} 您输入的sudo用户名为 ${Green_background_prefix}${sudo_user}${Font_color_suffix} ,将为您继续安装..." && user=${sudo_user}
Expand Down Expand Up @@ -90,18 +90,18 @@ check_nodejs() {


LinuxQQ_install() {
sudo apt update && sudo apt upgrade -y
sudo apt-get install wget curl gnupg git screen -y #安装后续所需软件包
apt update && apt upgrade -y
apt-get install wget curl gnupg git screen -y #安装后续所需软件包
echo -e "${Info} 开始安装 LinuxQQ..."
cd /tmp/
wget https://dldir1.qq.com/qqfile/qq/QQNT/ad5b5393/linuxqq_3.1.2-13107_${arch}.deb
sudo dpkg -i ./linuxqq_3.1.2-13107_${arch}.deb
dpkg -i ./linuxqq_3.1.2-13107_${arch}.deb
if [ $? = 0 ] ; then
echo -e "${Info} LinuxQQ 安装成功..."
sudo rm -rf linuxqq_3.1.2-13107_${arch}.deb
rm -rf linuxqq_3.1.2-13107_${arch}.deb
else
echo -e "${Error} LinuxQQ 安装失败，请截图错误日志加群反馈"
sudo rm -rf linuxqq_3.1.2-13107_${arch}.deb && exit 1
rm -rf linuxqq_3.1.2-13107_${arch}.deb && exit 1
fi
LiteLoader_install

Expand All @@ -111,7 +111,7 @@ LiteLoader_install() {
echo -e "${Info} 正在拉取最新版本的仓库..."
git clone ${ghproxy}https://github.com/LiteLoaderQQNT/LiteLoaderQQNT.git
cd /tmp/LiteLoaderQQNT
sudo sed -i 's/url = /url = https:\/\/mirror.ghproxy.com\//g' ./.gitmodules
sed -i 's/url = /url = https:\/\/mirror.ghproxy.com\//g' ./.gitmodules
git submodule sync
git submodule update --init --recursive -f #添加子模块代理并从主仓库拉取子模块
cd /tmp/LiteLoaderQQNT/builtins/
Expand All @@ -126,24 +126,24 @@ LiteLoader_install() {
done

echo -e "${Info} 正在安装LiteLoader..."
sudo rm -rf /opt/QQ/resources/app/LiteLoaderQQNT > /dev/null 2>&1
sudo mv /tmp/LiteLoaderQQNT /opt/QQ/resources/app
rm -rf /opt/QQ/resources/app/LiteLoaderQQNT > /dev/null 2>&1
mv /tmp/LiteLoaderQQNT /opt/QQ/resources/app

cd /opt/QQ/resources/app
echo -e "${Info} 正在修补package.json..."
sudo sed -i 's|"main": "./app_launcher/index.js"|"main": "LiteLoaderQQNT"|' package.json
sed -i 's|"main": "./app_launcher/index.js"|"main": "LiteLoaderQQNT"|' package.json
cd /tmp/
wget ${ghproxy}https://raw.githubusercontent.com/soloxiaoye2022/LiteLoaderQQNT-for-Linux_desktop-depoly/main/LiteLoaderQQNT-Plugin-Chronocat.tar.gz
mkdir ${work_dir}/${Documents}/LiteLoaderQQNT/ && mkdir ${work_dir}/${Documents}/LiteLoaderQQNT/plugins/
mkdir ${work_dir}/${Documents}/LiteLoaderQQNT/plugins/LiteLoaderQQNT-Plugin-Chronocat/
sudo tar -zxvf LiteLoaderQQNT-Plugin-Chronocat.tar.gz -C ${work_dir}/${Documents}/LiteLoaderQQNT/plugins/LiteLoaderQQNT-Plugin-Chronocat/
sudo rm -rf LiteLoaderQQNT-Plugin-Chronocat.tar.gz
sudo chown -R ${user}:${groups} /${work_dir}/${Documents}/LiteLoaderQQNT/ #修改LiteLoaderQQNT所有者和用户组确保QQ有权限访问
sudo killall -HUP qq > /dev/null 2>&1 & #杀死QQ原有进程
sudo chown -R ${user}:${groups} /opt/QQ/ #修改QQ所有者以及组确保图形界面可打开
tar -zxvf LiteLoaderQQNT-Plugin-Chronocat.tar.gz -C ${work_dir}/${Documents}/LiteLoaderQQNT/plugins/LiteLoaderQQNT-Plugin-Chronocat/
rm -rf LiteLoaderQQNT-Plugin-Chronocat.tar.gz
chown -R ${user}:${groups} /${work_dir}/${Documents}/LiteLoaderQQNT/ #修改LiteLoaderQQNT所有者和用户组确保QQ有权限访问
killall -HUP qq > /dev/null 2>&1 & #杀死QQ原有进程
chown -R ${user}:${groups} /opt/QQ/ #修改QQ所有者以及组确保图形界面可打开
cat > /tmp/start_qq.sh<<-EOF
#!/usr/bin/env bash
sudo -u ${user} nohup qq& > /dev/null 2>&1 & #启动LinuxQQ
-u ${user} nohup qq& > /dev/null 2>&1 & #启动LinuxQQ
disown %1 > /dev/null 2>&1 & #QQ进程与终端分离保持后台运行
exit 0
EOF
Expand All @@ -166,7 +166,7 @@ EOF

TRSS_Yunzai_install() {
echo -e "${Info} 开始安装 TRSS云崽..."
cd /opt/ && sudo mkdir Yunzai
cd /opt/ && mkdir Yunzai
git clone --depth 1 ${ghproxy}https://github.com/TimeRainStarSky/Yunzai
cd Yunzai
git clone --depth 1 ${ghproxy}https://github.com/TimeRainStarSky/Yunzai-genshin plugins/genshin
Expand Down Expand Up @@ -254,7 +254,7 @@ EOF
uin: ${bot_qq}
EOF
echo -e "${Info} 配置完成..."
sudo chown -R ${user}:${groups} /opt/Yunzai/ #修改Yunzai所有者和用户组确方便图形界面用户修改配置
chown -R ${user}:${groups} /opt/Yunzai/ #修改Yunzai所有者和用户组确方便图形界面用户修改配置

}

Expand All @@ -263,7 +263,7 @@ set_bot_qq() {
[[ -z "${bot_qq}" ]] && echo -e "${Eroor} Bot QQ号不能为空，请检查您的输入！" && set_bot_qq
expr $bot_qq + 0 > /dev/null 2>&1
[[ $? -eq 1 ]] && echo -e "${Eroor} Bot QQ号错误，请检查您的输入！" && set_bot_qq
sudo sed -i "s/masterQQ:.*/masterQQ:\n - \"$master_qq\"/" /opt/Yunzai/config/config/other.yaml && echo -e "${Info} Bot QQ号: $bot_qq 设置成功..." #|| echo -e "${Eroor} 配置文件不存在，请检查 Yunzai 是否正确安装并启动生成配置文件！" && exit 1
sed -i "s/masterQQ:.*/masterQQ:\n - \"$master_qq\"/" /opt/Yunzai/config/config/other.yaml && echo -e "${Info} Bot QQ号: $bot_qq 设置成功..." #|| echo -e "${Eroor} 配置文件不存在，请检查 Yunzai 是否正确安装并启动生成配置文件！" && exit 1

}

Expand All @@ -272,16 +272,16 @@ set_master_qq(){
[[ -z "${master_qq}" ]] && echo -e "${Eroor} 主人 QQ号不能为空，请检查您的输入！" && set_master_qq
expr $master_qq + 0 > /dev/null 2>&1
[[ $? -eq 1 ]] && echo -e "${Eroor} 主人 QQ号错误，检查您的输入！" && set_master_qq
sudo sed -i "/master:/a\ - \"$bot_qq:$master_qq\"" /opt/Yunzai/config/config/other.yaml && echo -e "${Info} 主人 QQ号： $master_qq 设置成功..." #|| echo -e "${Eroor} 配置文件不存在，请检查 Yunzai 是否正确安装并启动生成配置文件！" && exit 1
sed -i "/master:/a\ - \"$bot_qq:$master_qq\"" /opt/Yunzai/config/config/other.yaml && echo -e "${Info} 主人 QQ号： $master_qq 设置成功..." #|| echo -e "${Eroor} 配置文件不存在，请检查 Yunzai 是否正确安装并启动生成配置文件！" && exit 1

}

nodejs_install() {
echo -e "${Info} 开始安装nodejs..."
if [[ ${release} == "ubuntu" || ${release} == "debian" ]]; then
curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
sudo apt update
sudo apt install -y nodejs
curl -fsSL https://deb.nodesource.com/setup_16.x | -E bash -
apt update
apt install -y nodejs
fi
npm_install
}
Expand All @@ -290,7 +290,7 @@ npm_install() {
if [[ ! -x "$(command -v npm)" ]]; then
#if [[ ${release} == "ubuntu" || ${release} == "debian" ]]; then
npm config set registry https://registry.npm.taobao.org/ #设置npm淘宝源
sudo apt install npm -y && npm install npm@8.19.4 -g
apt install npm -y && npm install npm@8.19.4 -g
fi
LinuxQQ_install

Expand All @@ -299,7 +299,7 @@ npm_install() {
Install() {
echo -e "${Info} 开始安装..."
startTime=`date +%s`
sudo -v
-v
check_root
check_sys
check_nodejs
Expand Down