Skip to content

Commit f4e9d1d

Browse files
authored
Add files via upload
1 parent bf46558 commit f4e9d1d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

x-ui-pro.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
#################### x-ui-pro v6.6.3 @ github.com/GFW4Fun ##############################################
2+
#################### x-ui-pro v6.6.1 @ github.com/GFW4Fun ##############################################
33
[[ $EUID -ne 0 ]] && echo "not root!" && sudo su -
44
##############################INFO######################################################################
55
msg_ok() { echo -e "\e[1;42m $1 \e[0m";}
@@ -70,14 +70,14 @@ if [[ ${INSTALL} == *"y"* ]]; then
7070
systemctl daemon-reload
7171
systemctl enable nginx.service
7272
systemctl enable tor.service
73-
systemctl enable crond.service &>/dev/null
73+
systemctl enable crond.service
7474
systemctl start nginx
7575
systemctl start tor
7676
fi
7777
###############################Stop nginx#############################################################
78-
sudo nginx -s stop &>/dev/null
79-
sudo systemctl stop nginx &>/dev/null
80-
sudo fuser -k 80/tcp 80/udp 443/tcp 443/udp &>/dev/null
78+
sudo nginx -s stop 2>/dev/null
79+
sudo systemctl stop nginx 2>/dev/null
80+
sudo fuser -k 80/tcp 80/udp 443/tcp 443/udp 2>/dev/null
8181
##################################GET SERVER IPv4-6#####################################################
8282
IP4_REGEX="^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$"
8383
IP6_REGEX="([a-f0-9:]+:+)+[a-f0-9]+"
@@ -157,8 +157,8 @@ add_slashes() {
157157
########################################Update X-UI Port/Path for first INSTALL#########################
158158
UPDATE_XUIDB(){
159159
if [[ -f $XUIDB ]]; then
160-
x-ui stop &>/dev/null
161-
fuser "$XUIDB" &>/dev/null
160+
x-ui stop
161+
fuser "$XUIDB" 2>/dev/null
162162
RNDSTRSLASH=$(add_slashes "$RNDSTR")
163163
sqlite3 "$XUIDB" << EOF
164164
DELETE FROM 'settings' WHERE key IN ('webPort', 'webCertFile', 'webKeyFile', 'webBasePath');
@@ -183,8 +183,8 @@ if ! systemctl is-active --quiet x-ui; then
183183
fi
184184
###################################Get Installed XUI Port/Path##########################################
185185
if [[ -f $XUIDB ]]; then
186-
x-ui stop &>/dev/null
187-
fuser "$XUIDB" &>/dev/null
186+
x-ui stop
187+
fuser "$XUIDB" 2>/dev/null
188188
PORT=$(sqlite3 "${XUIDB}" "SELECT value FROM settings WHERE key='webPort' LIMIT 1;" 2>&1)
189189
RNDSTR=$(sqlite3 "${XUIDB}" "SELECT value FROM settings WHERE key='webBasePath' LIMIT 1;" 2>&1)
190190
if [[ -z "${PORT}" ]] || ! [[ "${PORT}" =~ ^-?[0-9]+$ ]]; then
@@ -290,7 +290,7 @@ EOF
290290
if [[ -f "/etc/nginx/sites-available/$MainDomain" ]]; then
291291
unlink "/etc/nginx/sites-enabled/default" >/dev/null 2>&1
292292
rm -f "/etc/nginx/sites-enabled/default" "/etc/nginx/sites-available/default"
293-
ln -fs "/etc/nginx/sites-available/$MainDomain" "/etc/nginx/sites-enabled/" &>/dev/null
293+
ln -fs "/etc/nginx/sites-available/$MainDomain" "/etc/nginx/sites-enabled/" 2>/dev/null
294294
else
295295
msg_err "$MainDomain nginx config not exist!" && exit 1
296296
fi
@@ -300,7 +300,7 @@ if [[ $(nginx -t 2>&1 | grep -o 'successful') != "successful" ]]; then
300300
systemctl restart nginx
301301
else
302302
systemctl start nginx
303-
x-ui start &>/dev/null
303+
x-ui start
304304
fi
305305
######################cronjob for ssl/reload service/cloudflareips######################################
306306
crontab -l | grep -v "certbot\|x-ui\|cloudflareips" | crontab -

0 commit comments

Comments
 (0)