diff --git a/trojan.sh b/trojan.sh index 106b3e8..4b653c5 100644 --- a/trojan.sh +++ b/trojan.sh @@ -71,6 +71,7 @@ EOF if [ ! -d "/usr/src" ]; then mkdir /usr/src fi + mkdir /usr/src/trojan-cert cat > /etc/nginx/nginx.conf <<-EOF user root; worker_processes 1; @@ -108,11 +109,11 @@ EOF systemctl restart nginx systemctl enable nginx cd /usr/src - wget https://api.github.com/repos/trojan-gfw/trojan/releases/latest >/dev/null 2>&1 + wget -q https://api.github.com/repos/trojan-gfw/trojan/releases/latest >/dev/null 2>&1 latest_version=`grep tag_name latest| awk -F '[:,"v]' '{print $6}'` rm -f latest green "开始下载最新版trojan amd64" - wget https://github.com/trojan-gfw/trojan/releases/download/v${latest_version}/trojan-${latest_version}-linux-amd64.tar.xz + wget -q https://github.com/trojan-gfw/trojan/releases/download/v${latest_version}/trojan-${latest_version}-linux-amd64.tar.xz tar xf trojan-${latest_version}-linux-amd64.tar.xz >/dev/null 2>&1 rm -f trojan-${latest_version}-linux-amd64.tar.xz green "请设置trojan密码, 建议不要出现特殊字符" @@ -195,12 +196,9 @@ EOF } EOF cd /usr/src/trojan-cli/ - zip -q -r trojan-cli.zip /usr/src/trojan-cli/ rm -rf /usr/src/trojan-temp/ - rm -f /usr/src/trojan-cli.zip trojan_path=$(cat /dev/urandom | head -1 | md5sum | head -c 16) #mkdir /usr/share/nginx/html/${trojan_path} - #mv /usr/src/trojan-cli/trojan-cli.zip /usr/share/nginx/html/${trojan_path}/ cat > ${systempwd}trojan.service <<-EOF [Unit] Description=trojan @@ -444,14 +442,14 @@ function port_forward(){ function update_trojan(){ /usr/src/trojan/trojan -v 2>trojan.tmp curr_version=`cat trojan.tmp | grep "trojan" | awk '{print $4}'` - wget https://api.github.com/repos/trojan-gfw/trojan/releases/latest >/dev/null 2>&1 + wget -q https://api.github.com/repos/trojan-gfw/trojan/releases/latest >/dev/null 2>&1 latest_version=`grep tag_name latest| awk -F '[:,"v]' '{print $6}'` rm -f latest rm -f trojan.tmp if version_lt "$curr_version" "$latest_version"; then green "当前版本$curr_version,最新版本$latest_version,开始升级……" mkdir trojan_update_temp && cd trojan_update_temp - wget https://github.com/trojan-gfw/trojan/releases/download/v${latest_version}/trojan-${latest_version}-linux-amd64.tar.xz >/dev/null 2>&1 + wget -q https://github.com/trojan-gfw/trojan/releases/download/v${latest_version}/trojan-${latest_version}-linux-amd64.tar.xz >/dev/null 2>&1 tar xf trojan-${latest_version}-linux-amd64.tar.xz >/dev/null 2>&1 mv ./trojan/trojan /usr/src/trojan/ cd .. && rm -rf trojan_update_temp