diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh index 7fdf987f7..ea36ced7a 100755 --- a/plugins/php/versions/common/openssl.sh +++ b/plugins/php/versions/common/openssl.sh @@ -46,6 +46,11 @@ Install_lib() cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh fi + if [ "$sysName" == "Darwin" ] ;then + LIB_DEPEND_DIR=`brew info openssl@1.1 | grep /usr/local/Cellar/openssl | cut -d \ -f 1 | awk 'END {print}'` + export PKG_CONFIG_PATH=$LIB_DEPEND_DIR/lib/pkgconfig + fi + if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then diff --git a/route/static/app/soft.js b/route/static/app/soft.js index ed88dd2d2..826d28a03 100755 --- a/route/static/app/soft.js +++ b/route/static/app/soft.js @@ -7,13 +7,16 @@ function resetPluginWinWidth(width){ //软件管理窗口 function softMain(name, title, version) { + + var _title = title.replace('-'+version,'') + var loadT = layer.msg("正在处理,请稍后...", { icon: 16, time: 0, shade: [0.3, '#000'] }); $.get('/plugins/setting?name='+name, function(rdata) { layer.close(loadT); layer.open({ type: 1, area: '640px', - title: title + '【' + version + "】管理", + title: _title + '【' + version + "】管理", closeBtn: 1, shift: 0, content: rdata