From b55c68ceeac5e6f40f8cd72abe8555c66a45eda5 Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Sat, 17 Jun 2023 11:35:57 +0800
Subject: [PATCH] install unzip when redhat9

---
 CHANGELOG.md                    | 1 +
 appmanage/Dockerfile            | 2 +-
 appmanage/api/service/manage.py | 2 +-
 install/install.sh              | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8882d39..b5418971 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 1. appstore 升级脚本输出内容过多引起的异常修复
 2. 安装脚本对于 yq 失败的异常处理
+3. 对部分操作系统（如 redhat9）安装 unzip 包
 
 ## 0.4.0 release on 2023-06-15
 
diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile
index d6cf741e..ef28a3a5 100644
--- a/appmanage/Dockerfile
+++ b/appmanage/Dockerfile
@@ -10,7 +10,7 @@ COPY static ./static
 COPY requirements.txt main.py  ./
 RUN apt update
 
-# Install supervisords
+# Install supervisord
 RUN apt install -y supervisor
 COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY config/cmd.sh /cmd.sh
diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py
index deca4366..8bf87277 100644
--- a/appmanage/api/service/manage.py
+++ b/appmanage/api/service/manage.py
@@ -59,7 +59,7 @@ def AppStoreUpdate():
         for change in change_log[1:]:
             if change != '':
                 content.append(change)
-        shell_execute.execute_command_output_all("wget curl https://websoft9.github.io/StackHub/install/update_appstore.sh && bash update_appstore.sh 1>/dev/null 2>&1")
+        shell_execute.execute_command_output_all("wget https://websoft9.github.io/StackHub/install/update_appstore.sh && bash update_appstore.sh 1>/dev/null 2>&1")
         
         return content
     else:
diff --git a/install/install.sh b/install/install.sh
index 3cd28db2..a060f32e 100644
--- a/install/install.sh
+++ b/install/install.sh
@@ -134,7 +134,7 @@ echo "Prepare to install Tools ..."
 
 if [ "$os_type" == 'CentOS' ] || [ "$os_type" == 'CentOS Stream' ]  || [ "$os_type" == 'Fedora' ] || [ "$os_type" == 'OracleLinux' ] || [ "$os_type" == 'Redhat' ];then
   sudo yum update -y 1>/dev/null 2>&1
-  sudo yum install  git curl wget yum-utils jq firewalld bc -y  1>/dev/null 2>&1
+  sudo yum install  git curl wget yum-utils jq firewalld bc unzip -y  1>/dev/null 2>&1
 
 fi
 
@@ -144,7 +144,7 @@ if [ "$os_type" == 'Ubuntu' ] || [ "$os_type" == 'Debian' ] ;then
       sleep 5
   done
   sudo apt update -y 1>/dev/null 2>&1
-  sudo apt install git curl wget jq firewalld bc -y  1>/dev/null 2>&1
+  sudo apt install git curl wget jq firewalld bc unzip -y  1>/dev/null 2>&1
 fi
 
 }