Ver código fonte

fix:file not remove

oneinstack 11 meses atrás
pai
commit
804cee010d
3 arquivos alterados com 6 adições e 6 exclusões
  1. 2 2
      include/nginx.sh
  2. 2 2
      include/openresty.sh
  3. 2 2
      include/tengine.sh

+ 2 - 2
include/nginx.sh

@@ -32,10 +32,10 @@ Install_Nginx() {
   make -j ${THREAD} && make install
   if [ -e "${nginx_install_dir}/conf/nginx.conf" ]; then
     popd > /dev/null
-    rm -rf pcre-${pcre_ver} openssl-${openssl11_ver} nginx-${nginx_ver}
+    rm -rf pcre-${pcre_ver}* openssl-${openssl11_ver}* nginx-${nginx_ver}* ${nginx_install_dir}*
     echo "${CSUCCESS}Nginx installed successfully! ${CEND}"
   else
-    rm -rf ${nginx_install_dir}
+    rm -rf pcre-${pcre_ver}* openssl-${openssl11_ver}* nginx-${nginx_ver}* ${nginx_install_dir}*
     echo "${CFAILURE}Nginx install failed, Please Contact the author! ${CEND}"
     kill -9 $$; exit 1;
   fi

+ 2 - 2
include/openresty.sh

@@ -28,10 +28,10 @@ Install_OpenResty() {
   make -j ${THREAD} && make install
   if [ -e "${openresty_install_dir}/nginx/conf/nginx.conf" ]; then
     popd > /dev/null
-    rm -rf pcre-${pcre_ver} openssl-${openssl11_ver} openresty-${openresty_ver}
+    rm -rf pcre-${pcre_ver}* openssl-${openssl11_ver}* openresty-${openresty_ver}* ${openresty_install_dir}*
     echo "${CSUCCESS}OpenResty installed successfully! ${CEND}"
   else
-    rm -rf ${openresty_install_dir}
+    rm -rf pcre-${pcre_ver}* openssl-${openssl11_ver}* openresty-${openresty_ver}* ${openresty_install_dir}*
     echo "${CFAILURE}OpenResty install failed, Please Contact the author! ${CEND}"
     kill -9 $$; exit 1;
   fi

+ 2 - 2
include/tengine.sh

@@ -27,10 +27,10 @@ Install_Tengine() {
   make && make install
   if [ -e "${tengine_install_dir}/conf/nginx.conf" ]; then
     popd > /dev/null
-    rm -rf pcre-${pcre_ver} openssl-${openssl11_ver} tengine-${tengine_ver}
+    rm -rf pcre-${pcre_ver}* openssl-${openssl11_ver}* tengine-${tengine_ver}* rm -rf ${tengine_install_dir}*
     echo "${CSUCCESS}Tengine installed successfully! ${CEND}"
   else
-    rm -rf ${tengine_install_dir}
+    rm -rf pcre-${pcre_ver}* openssl-${openssl11_ver}* tengine-${tengine_ver}* rm -rf ${tengine_install_dir}*
     echo "${CFAILURE}Tengine install failed, Please Contact the author! ${CEND}"
     kill -9 $$; exit 1;
   fi