From 0f51a6d481cda5bf4f3c65430a2bf4fa13035b91 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 16 Aug 2023 22:06:43 +0800 Subject: [PATCH] update --- plugins/mongodb/install.sh | 7 ++++++- plugins/mongodb/versions/7.0/macos.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/mongodb/install.sh b/plugins/mongodb/install.sh index 76ecd7fac..6ee597053 100755 --- a/plugins/mongodb/install.sh +++ b/plugins/mongodb/install.sh @@ -3,7 +3,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export PATH # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 5.0.4 -# cd /www/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 5.0.4 +# cd /www/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 7.0 curPath=`pwd` rootPath=$(dirname "$curPath") @@ -17,6 +17,11 @@ sysName=`uname` echo "use system: ${sysName}" OSNAME=`bash ${rootPath}/scripts/getos.sh` + +if [ "" == "$OSNAME" ];then + OSNAME=`cat ${rootPath}/data/osname.pl` +fi + if [ "macos" != "$OSNAME" ];then SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'` fi diff --git a/plugins/mongodb/versions/7.0/macos.sh b/plugins/mongodb/versions/7.0/macos.sh index 1a8061fcd..c78167779 100644 --- a/plugins/mongodb/versions/7.0/macos.sh +++ b/plugins/mongodb/versions/7.0/macos.sh @@ -22,7 +22,7 @@ if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz fi -if [ ! -d $serverPath/mongodb/bin ];then +if [ ! -d $serverPath/mongodb/bin ];then mkdir -p $serverPath/mongodb cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb fi \ No newline at end of file