diff --git a/cyberpanel.sh b/cyberpanel.sh index d7bbb11f1..6c8d0a5e3 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -27,6 +27,9 @@ CENTOS_8="False" WATCHDOG="OFF" BRANCH_NAME="v${TEMP:12:3}.${TEMP:25:1}" VIRT_TYPE="" +GIT_URL="github.com/usmannasir/cyberpanel" +GIT_CONTENT_URL="raw.githubusercontent.com/usmannasir/cyberpanel" + check_return() { #check previous command result , 0 = ok , non-0 = something wrong. @@ -252,6 +255,7 @@ if [[ $SERVER_COUNTRY == "CN" ]] ; then sed -i 's|http://repo.dovecot.org/ce-2.3-latest/centos/$releasever/RPMS/$basearch|https://'$DOWNLOAD_SERVER'/dovecot/|g' install.py sed -i 's|'$DOWNLOAD_SERVER'|cyberpanel.sh|g' install.py sed -i 's|https://www.litespeedtech.com/packages/5.0/lsws-5.4.2-ent-x86_64-linux.tar.gz|https://'$DOWNLOAD_SERVER'/litespeed/lsws-'$LSWS_STABLE_VER'-ent-x86_64-linux.tar.gz|g' installCyberPanel.py + sed -i 's|wget -O - https://get.acme.sh \| sh|git clone https://gitee.com/qtwrk/acme.sh.git ; cd acme.sh ; ./acme.sh --install ; cd - ; rm -rf acme.sh|g' install.py # global change for CN , regardless provider and system if [[ $SERVER_OS == "CentOS" ]] ; then @@ -507,7 +511,9 @@ if [[ $SERVER_COUNTRY == "CN" ]] ; then mkdir /root/.config/pip cat << EOF > /root/.config/pip/pip.conf [global] -index-url = https://mirrors.aliyun.com/pypi/simple/ +index-url = https://pypi.tuna.tsinghua.edu.cn/simple +[install] +trusted-host=pypi.tuna.tsinghua.edu.cn EOF fi @@ -567,6 +573,7 @@ if [[ $SERVER_OS == "Ubuntu" ]] ; then if [[ $DEV == "ON" ]] ; then DEBIAN_FRONTEND=noninteractive apt install -y python3-pip check_return + ln -s /usr/bin/pip3 /usr/bin/pip3.6 DEBIAN_FRONTEND=noninteractive apt install -y build-essential libssl-dev libffi-dev python3-dev check_return DEBIAN_FRONTEND=noninteractive apt install -y python3-venv @@ -1132,7 +1139,7 @@ if [[ $debug == "0" ]] ; then fi if [[ $debug == "1" ]] ; then - wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt + wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt check_return /usr/local/CyberPanel/bin/pip3 install --ignore-installed -r requirements.txt rm -f requirements.txt @@ -1182,7 +1189,7 @@ fi virtualenv --system-site-packages /usr/local/CyberPanel source /usr/local/CyberPanel/bin/activate rm -rf requirements.txt -wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/1.8.0/requirments.txt +wget -O requirements.txt https://$GIT_CONTENT_URL/1.8.0/requirments.txt check_return pip install --ignore-installed -r requirements.txt check_return @@ -1195,7 +1202,7 @@ if [[ $DEV == "ON" ]] ; then cd /usr/local/ virtualenv -p /usr/bin/python3 CyberPanel source /usr/local/CyberPanel/bin/activate - wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt + wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt check_return pip3.6 install --ignore-installed -r requirements.txt check_return @@ -1207,26 +1214,15 @@ if [ -f requirements.txt ] && [ -d cyberpanel ] ; then rm -f requirements.txt fi -if [[ $SERVER_COUNTRY == "CN" ]] ; then - wget https://cyberpanel.sh/cyberpanel-git.tar.gz - tar xzvf cyberpanel-git.tar.gz > /dev/null - cp -r cyberpanel /usr/local/cyberpanel - cd cyberpanel/install -else - if [[ $DEV == "ON" ]] ; then - git clone https://github.com/usmannasir/cyberpanel - cd cyberpanel - git checkout $BRANCH_NAME - check_return - cd - - cp -r cyberpanel /usr/local/cyberpanel - cd cyberpanel/install - else - git clone https://github.com/usmannasir/cyberpanel - cp -r cyberpanel /usr/local/cyberpanel - cd cyberpanel/install - fi -fi +git clone https://${GIT_URL} +cd cyberpanel +git checkout $BRANCH_NAME +check_return +cd - +cp -r cyberpanel /usr/local/cyberpanel +cd cyberpanel/install + + curl https://cyberpanel.sh/?version } @@ -1265,7 +1261,7 @@ EOF virtualenv -p /usr/bin/python3 /usr/local/CyberCP source /usr/local/CyberCP/bin/activate -wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt +wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt check_return pip3.6 install --ignore-installed -r requirements.txt check_return @@ -1612,6 +1608,8 @@ fi #test string if [[ $SERVER_COUNTRY == "CN" ]] ; then DOWNLOAD_SERVER="cyberpanel.sh" +GIT_URL="gitee.com/qtwrk/cyberpanel" +GIT_CONTENT_URL="gitee.com/qtwrk/cyberpanel/raw" else DOWNLOAD_SERVER="cdn.cyberpanel.sh" fi diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index b143bafa1..db0c76bdf 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -7,6 +7,25 @@ SERVER_OS='Undefined' OUTPUT=$(cat /etc/*release) TEMP=$(curl --silent https://cyberpanel.net/version.txt) BRANCH_NAME=v${TEMP:12:3}.${TEMP:25:1} +GIT_URL="github.com/usmannasir/cyberpanel" +GIT_CONTENT_URL="raw.githubusercontent.com/usmannasir/cyberpanel" +SERVER_COUNTRY="unknow" +SERVER_COUNTRY=$(curl --silent --max-time 5 https://cyberpanel.sh/?country) +if [[ ${#SERVER_COUNTRY} == "2" ]] || [[ ${#SERVER_COUNTRY} == "6" ]] ; then + echo -e "\nChecking server..." +else + echo -e "\nChecking server..." + SERVER_COUNTRY="unknow" +fi + +#SERVER_COUNTRY="CN" +#for test + +if [[ $SERVER_COUNTRY == "CN" ]] ; then + GIT_URL="gitee.com/qtwrk/cyberpanel" + GIT_CONTENT_URL="gitee.com/qtwrk/cyberpanel/raw" +fi + input_branch() { echo -e "\nPress Enter key to continue with latest version or Enter specific version such as: \e[31m1.9.4\e[39m , \e[31m1.9.5\e[39m ...etc" @@ -136,43 +155,50 @@ rm -rf /usr/local/CyberPanel virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel check_return rm -f requirments.txt -wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt +wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt . /usr/local/CyberPanel/bin/activate check_return if [ $SERVER_OS = "Ubuntu" ] ; then . /usr/local/CyberPanel/bin/activate check_return - pip3 install --ignore-installed -r requirments.txt + pip3 install --ignore-installed -r requirements.txt check_return else source /usr/local/CyberPanel/bin/activate check_return - pip3.6 install --ignore-installed -r requirments.txt + pip3.6 install --ignore-installed -r requirements.txt check_return fi virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel check_return rm -rf upgrade.py -wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/plogical/upgrade.py +wget https://$GIT_CONTENT_URL/${BRANCH_NAME}/plogical/upgrade.py + +if [[ $SERVER_COUNTRY == "CN" ]] ; then +sed -i 's|wget https://raw.githubusercontent.com/usmannasir/cyberpanel/v1.9.4/lscpd-0.2.4 -P /usr/local/lscp/bin/|cp -f /usr/local/CyberCP/lscpd-0.2.4 /usr/local/lscp/bin/lscpd-0.2.4|g' upgrade.py +sed -i 's|wget https://raw.githubusercontent.com/usmannasir/cyberpanel/%s/lscpd-0.2.4 -P /usr/local/lscp/bin/|cp -f /usr/local/CyberCP/lscpd-0.2.4 /usr/local/lscp/bin/lscpd-0.2.4|g' upgrade.py +sed -i $'s/0.2.4\' % (branch)/0.2.4\'/' upgrade.py +sed -i 's|raw.githubusercontent.com/usmannasir/cyberpanel|'${GIT_CONTENT_URL}'|g' upgrade.py +sed -i 's|git clone https://github.com/usmannasir/cyberpanel|git clone https://'${GIT_URL}'|g' upgrade.py +fi + /usr/local/CyberPanel/bin/python upgrade.py $BRANCH_NAME check_return -## - virtualenv -p /usr/bin/python3 /usr/local/CyberCP check_return -wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt +wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt if [ $SERVER_OS = "Ubuntu" ] ; then . /usr/local/CyberCP/bin/activate check_return - pip3 install --ignore-installed -r requirments.txt + pip3 install --ignore-installed -r requirements.txt check_return else source /usr/local/CyberCP/bin/activate check_return - pip3.6 install --ignore-installed -r requirments.txt + pip3.6 install --ignore-installed -r requirements.txt check_return fi diff --git a/cyberpanel_utility.sh b/cyberpanel_utility.sh index c9e0e98bf..edbd9b561 100644 --- a/cyberpanel_utility.sh +++ b/cyberpanel_utility.sh @@ -4,6 +4,8 @@ export LC_CTYPE=en_US.UTF-8 SUDO_TEST=$(set) BRANCH_NAME="stable" +GIT_URL="github.com/usmannasir/cyberpanel" +GIT_CONTENT_URL="raw.githubusercontent.com/usmannasir/cyberpanel" check_OS() { echo -e "\nChecking OS..." @@ -125,12 +127,26 @@ rm -f /tmp/cyberpanel_utility.sh } cyberpanel_upgrade() { +SERVER_COUNTRY="unknow" +SERVER_COUNTRY=$(curl --silent --max-time 5 https://cyberpanel.sh/?country) +if [[ ${#SERVER_COUNTRY} == "2" ]] || [[ ${#SERVER_COUNTRY} == "6" ]] ; then + echo -e "\nChecking server..." +else + echo -e "\nChecking server..." + SERVER_COUNTRY="unknow" +fi + +if [[ $SERVER_COUNTRY == "CN" ]] ; then + GIT_URL="gitee.com/qtwrk/cyberpanel" + GIT_CONTENT_URL="gitee.com/qtwrk/cyberpanel/raw" +fi + echo -e "CyberPanel Upgrade will start in 10 seconds" echo -e "If you want to cancel, please press CTRL + C to cancel it" sleep 10 echo -e "CyberPanel upgrading..." rm -f /usr/local/cyberpanel_upgrade.sh -wget -O /usr/local/cyberpanel_upgrade.sh -q https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh +wget -O /usr/local/cyberpanel_upgrade.sh -q https://$GIT_CONTENT_URL/${BRANCH_NAME}/cyberpanel_upgrade.sh chmod 700 /usr/local/cyberpanel_upgrade.sh /usr/local/cyberpanel_upgrade.sh rm -f /usr/local/cyberpanel_upgrade.sh diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 21b00a801..3faee2090 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1499,7 +1499,7 @@ CSRF_COOKIE_SECURE = True if os.path.exists(lscpdPath): os.remove(lscpdPath) - command = 'wget https://raw.githubusercontent.com/usmannasir/cyberpanel/v1.9.4/lscpd-0.2.4 -P /usr/local/lscp/bin/' + command = 'cp -f /usr/local/CyberCP/lscpd-0.2.4 /usr/local/lscp/bin/lscpd-0.2.4' Upgrade.executioner(command, command, 0) command = 'rm -f /usr/local/lscp/bin/lscpd' diff --git a/test.sh b/test.sh index 81a02b3cb..649fe22cf 100644 --- a/test.sh +++ b/test.sh @@ -1,3 +1,2 @@ -test3 -test2 -test +test4 +test3 \ No newline at end of file