From 6eae94658fb247720809fa2d91d2ea94b703978e Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Mon, 24 Oct 2022 19:55:09 +0800
Subject: [PATCH] up

---
 plugins/php-apt/js/php.js     |  2 +-
 plugins/php-yum/js/php.js     |  2 +-
 plugins/php/js/php.js         |  2 +-
 plugins/phpmyadmin/install.sh | 12 +++++++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/php-apt/js/php.js b/plugins/php-apt/js/php.js
index 9b20f6f98..f7dec298d 100755
--- a/plugins/php-apt/js/php.js
+++ b/plugins/php-apt/js/php.js
@@ -380,7 +380,7 @@ function getSessionConfig(version){
         }
         var rdata = rdata.data;
 
-         var cacheList = "<option value='file' " + (rdata.save_handler == "file" ? 'selected' : '') + ">file</option>" +
+         var cacheList = "<option value='files' " + (rdata.save_handler == "files" ? 'selected' : '') + ">files</option>" +
             "<option value='redis' " + (rdata.save_handler == "redis" ? 'selected' : '') + ">redis</option>" +
             "<option value='memcache' " + (rdata.save_handler == "memcache" ? 'selected' : '') + ">memcache</option>" +
             "<option value='memcached' " + (rdata.save_handler == "memcached" ? 'selected' : '') + ">memcached</option>";
diff --git a/plugins/php-yum/js/php.js b/plugins/php-yum/js/php.js
index 332158bbd..561acf53a 100755
--- a/plugins/php-yum/js/php.js
+++ b/plugins/php-yum/js/php.js
@@ -349,7 +349,7 @@ function getSessionConfig(version){
         }
         var rdata = rdata.data;
 
-         var cacheList = "<option value='file' " + (rdata.save_handler == "file" ? 'selected' : '') + ">file</option>" +
+         var cacheList = "<option value='files' " + (rdata.save_handler == "files" ? 'selected' : '') + ">files</option>" +
             "<option value='redis' " + (rdata.save_handler == "redis" ? 'selected' : '') + ">redis</option>" +
             "<option value='memcache' " + (rdata.save_handler == "memcache" ? 'selected' : '') + ">memcache</option>" +
             "<option value='memcached' " + (rdata.save_handler == "memcached" ? 'selected' : '') + ">memcached</option>";
diff --git a/plugins/php/js/php.js b/plugins/php/js/php.js
index 1ba06775b..15297a612 100755
--- a/plugins/php/js/php.js
+++ b/plugins/php/js/php.js
@@ -339,7 +339,7 @@ function getSessionConfig(version){
         }
         var rdata = rdata.data;
 
-         var cacheList = "<option value='file' " + (rdata.save_handler == "file" ? 'selected' : '') + ">file</option>" +
+         var cacheList = "<option value='files' " + (rdata.save_handler == "files" ? 'selected' : '') + ">files</option>" +
             "<option value='redis' " + (rdata.save_handler == "redis" ? 'selected' : '') + ">redis</option>" +
             "<option value='memcache' " + (rdata.save_handler == "memcache" ? 'selected' : '') + ">memcache</option>" +
             "<option value='memcached' " + (rdata.save_handler == "memcached" ? 'selected' : '') + ">memcached</option>";
diff --git a/plugins/phpmyadmin/install.sh b/plugins/phpmyadmin/install.sh
index cec74fe58..af0e9bb7f 100755
--- a/plugins/phpmyadmin/install.sh
+++ b/plugins/phpmyadmin/install.sh
@@ -10,10 +10,20 @@ serverPath=$(dirname "$rootPath")
 install_tmp=${rootPath}/tmp/mw_install.pl
 
 
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
+if [ "$sys_os" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
 sysName=`uname`
 echo "use system: ${sysName}"
 
-if [ ${sysName} == "Darwin" ]; then
+if [ "${sysName}" == "Darwin" ]; then
 	OSNAME='macos'
 elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
 	OSNAME='centos'