From fa64dfb89b77d8b79d56b3aa525c6ba51f40a8e0 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 2 Nov 2024 16:15:21 +0800
Subject: [PATCH] update

---
 plugins/openresty/install.sh                 | 1 -
 plugins/openresty/versions/1.17.8/install.sh | 5 +++++
 plugins/openresty/versions/1.19.3/install.sh | 4 ++++
 plugins/openresty/versions/1.21.4/install.sh | 4 ++++
 plugins/openresty/versions/1.25.3/install.sh | 4 ++++
 plugins/openresty/versions/1.27.1/install.sh | 4 ++++
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh
index 3c72e5451..35680f32d 100755
--- a/plugins/openresty/install.sh
+++ b/plugins/openresty/install.sh
@@ -57,5 +57,4 @@ if [ "${action}" == "install" ] && [ -d $serverPath/openresty ];then
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/openresty/index.py start
 	cd ${rootPath} && python3 ${rootPath}/plugins/openresty/index.py initd_install
-	rm -rf $openrestyDir/openresty-${VERSION}
 fi
diff --git a/plugins/openresty/versions/1.17.8/install.sh b/plugins/openresty/versions/1.17.8/install.sh
index d3bf95aab..4259f71ea 100644
--- a/plugins/openresty/versions/1.17.8/install.sh
+++ b/plugins/openresty/versions/1.17.8/install.sh
@@ -149,6 +149,11 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
+	
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.19.3/install.sh b/plugins/openresty/versions/1.19.3/install.sh
index 9934e2a6c..555a7a609 100644
--- a/plugins/openresty/versions/1.19.3/install.sh
+++ b/plugins/openresty/versions/1.19.3/install.sh
@@ -150,6 +150,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.21.4/install.sh b/plugins/openresty/versions/1.21.4/install.sh
index 531e38368..817699157 100644
--- a/plugins/openresty/versions/1.21.4/install.sh
+++ b/plugins/openresty/versions/1.21.4/install.sh
@@ -149,6 +149,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.25.3/install.sh b/plugins/openresty/versions/1.25.3/install.sh
index 9c5224662..473fe1938 100644
--- a/plugins/openresty/versions/1.25.3/install.sh
+++ b/plugins/openresty/versions/1.25.3/install.sh
@@ -164,6 +164,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }
 
diff --git a/plugins/openresty/versions/1.27.1/install.sh b/plugins/openresty/versions/1.27.1/install.sh
index 2183be696..8e4d01ca6 100644
--- a/plugins/openresty/versions/1.27.1/install.sh
+++ b/plugins/openresty/versions/1.27.1/install.sh
@@ -164,6 +164,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
     	rm -rf ${openrestyDir}/libressl-${libresslVersion}
     fi
+
+    if [ -d $openrestyDir/openresty-${VERSION} ];then
+		rm -rf $openrestyDir/openresty-${VERSION}
+	fi
 	echo '安装完成'
 }