diff --git a/scripts/update.sh b/scripts/update.sh index 3ff421349..02f566811 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -65,23 +65,27 @@ if [ "$?" != "0" ];then fi +CP_CMD=/usr/bin/cp +if [ -f /bin/cp ];then + CP_CMD=/bin/cp +fi + if [ "$LOCAL_ADDR" != "common" ];then curl --insecure -sSLo /tmp/master.zip https://code.midoks.me/midoks/mdserver-web/archive/master.zip + cd /tmp && unzip /tmp/master.zip + + $CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web + rm -rf /tmp/master.zip + rm -rf /tmp/mdserver-web else curl --insecure -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master -fi - - -cd /tmp && unzip /tmp/master.zip -CP_CMD=/usr/bin/cp -if [ -f /bin/cp ];then - CP_CMD=/bin/cp + cd /tmp && unzip /tmp/master.zip + $CP_CMD -rf /tmp/mdserver-web-master/* /www/server/mdserver-web + rm -rf /tmp/master.zip + rm -rf /tmp/mdserver-web-master fi -$CP_CMD -rf /tmp/mdserver-web-master/* /www/server/mdserver-web -rm -rf /tmp/master.zip -rm -rf /tmp/mdserver-web-master #pip uninstall public echo "use system version: ${OSNAME}" diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index dbb805107..a53c3b0e2 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -63,23 +63,28 @@ if [ "$?" != "0" ];then HTTP_PREFIX="https://ghproxy.com/" fi +CP_CMD=/usr/bin/cp +if [ -f /bin/cp ];then + CP_CMD=/bin/cp +fi + +echo "update mdserver-web code start" + if [ "$LOCAL_ADDR" != "common" ];then curl --insecure -sSLo /tmp/dev.zip https://code.midoks.me/midoks/mdserver-web/archive/dev.zip + cd /tmp && unzip /tmp/dev.zip + + $CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web + rm -rf /tmp/master.zip + rm -rf /tmp/mdserver-web else curl --insecure -sSLo /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip + cd /tmp && unzip /tmp/dev.zip + $CP_CMD -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web + rm -rf /tmp/dev.zip + rm -rf /tmp/mdserver-web-dev fi -# wget -O /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip -cd /tmp && unzip /tmp/dev.zip - -echo "update mdserver-web code start" -if [ -f /usr/bin/cp ];then - /usr/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web -elif [ -f /bin/cp ];then - /bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web -else - /usr/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web -fi echo "update mdserver-web code end" rm -rf /tmp/dev.zip