Merge pull request #796 from midoks/dev

update
pull/797/head 0.18.2
Mr Chen 4 weeks ago committed by GitHub
commit 2f912b4ddd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      scripts/init.d/mw.tpl
  2. 2
      scripts/install.sh
  3. 2
      scripts/install_dev.sh
  4. 2
      scripts/update.sh
  5. 2
      scripts/update_dev.sh

@ -352,12 +352,12 @@ mw_common_proxy(){
if [ "$LOCAL_ADDR" != "common" ];then
ChooseProxyURL
if [ "$DOMAIN" != "https://" ];then
if [ "$HTTP_PREFIX" != "https://" ];then
DOMAIN=`echo $HTTP_PREFIX | sed 's|https://||g'`
DOMAIN=`echo $DOMAIN | sed 's|/||g'`
ping -c 3 $DOMAIN > /dev/null 2>&1
if [ "$?" != "0" ];then
echo "无效代理地址${HTTP_PREFIX}"
echo "无效代理地址:${HTTP_PREFIX}"
exit
fi
fi

@ -134,7 +134,7 @@ function ChooseProxyURL(){
if [ "$LOCAL_ADDR" != "common" ];then
ChooseProxyURL
if [ "$DOMAIN" != "https://" ];then
if [ "$HTTP_PREFIX" != "https://" ];then
DOMAIN=`echo $HTTP_PREFIX | sed 's|https://||g'`
DOMAIN=`echo $DOMAIN | sed 's|/||g'`
ping -c 3 $DOMAIN > /dev/null 2>&1

@ -139,7 +139,7 @@ function ChooseProxyURL(){
if [ "$LOCAL_ADDR" != "common" ];then
ChooseProxyURL
if [ "$DOMAIN" != "https://" ];then
if [ "$HTTP_PREFIX" != "https://" ];then
DOMAIN=`echo $HTTP_PREFIX | sed 's|https://||g'`
DOMAIN=`echo $DOMAIN | sed 's|/||g'`
ping -c 3 $DOMAIN > /dev/null 2>&1

@ -136,7 +136,7 @@ function ChooseProxyURL(){
if [ "$LOCAL_ADDR" != "common" ];then
ChooseProxyURL
if [ "$DOMAIN" != "https://" ];then
if [ "$HTTP_PREFIX" != "https://" ];then
DOMAIN=`echo $HTTP_PREFIX | sed 's|https://||g'`
DOMAIN=`echo $DOMAIN | sed 's|/||g'`
ping -c 3 $DOMAIN > /dev/null 2>&1

@ -149,7 +149,7 @@ function ChooseProxyURL(){
if [ "$LOCAL_ADDR" != "common" ];then
ChooseProxyURL
if [ "$DOMAIN" != "https://" ];then
if [ "$HTTP_PREFIX" != "https://" ];then
DOMAIN=`echo $HTTP_PREFIX | sed 's|https://||g'`
DOMAIN=`echo $DOMAIN | sed 's|/||g'`
ping -c 3 $DOMAIN > /dev/null 2>&1

Loading…
Cancel
Save