diff --git a/devel/docker.sh b/devel/docker.sh index 1bc547b..07b3c7d 100755 --- a/devel/docker.sh +++ b/devel/docker.sh @@ -9,10 +9,9 @@ case "$PM" in apt) # snap docker will intefere native docker.io, must be dealt with sudo snap remove --purge docker + pm_update sudo apt install -y docker.io - if ! has_cmd python; then - "$PDIR/python/install.sh" - fi + "$PDIR/devel/python.sh" sudo pip3 install docker-compose ;; pacman) diff --git a/env.sh b/env.sh index b7af577..372d601 100755 --- a/env.sh +++ b/env.sh @@ -10,8 +10,8 @@ PDIR=$(dirname "${DIR-$0}") GITHUB_PROXY=${GITHUB_PROXY-$HTTPS_PROXY} in_china() { - ! [ -f /tmp/myip ] && curl -s myip.ipip.net > /tmp/myip - grep -qF '中国' /tmp/myip + ! [ -f /tmp/myip_full ] && curl -s myip.ipip.net > /tmp/myip_full + grep -qF '中国' /tmp/myip_full } lnsf() {