up

scripts/install.sh

@@ -106,7 +106,16 @@ fi
 
 
 echo "use system version: ${OSNAME}"
-cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
+
+if [ "${OSNAME}" == "macos" ];then
+	cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+	HTTP_PREFIX="https://"
+	if [ ! -z "$cn" ];then
+	    HTTP_PREFIX="https://ghproxy.com/"
+	fi
+else
+	cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
+fi
 
 if [ "${OSNAME}" == "macos" ];then
 	echo "macos end"

scripts/install_dev.sh

@@ -94,9 +94,12 @@ fi
 echo "use system version: ${OSNAME}"
 
 if [ "${OSNAME}" == "macos" ];then
-	USER=$(who | sed -n "2,1p" |awk '{print $1}')
+	cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
-	DEV="/Users/${USER}/Desktop/mwdev"
+	HTTP_PREFIX="https://"
-	cd $DEV && bash scripts/install/${OSNAME}.sh
+	if [ ! -z "$cn" ];then
+	    HTTP_PREFIX="https://ghproxy.com/"
+	fi
+	curl -fsSL ${HTTP_PREFIX}https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/macos.sh | bash
 else
 	cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
 fi