From b52becfad68754529a0958f53593e71f37dc0ca1 Mon Sep 17 00:00:00 2001
From: Code-Egg <eric780217@gmail.com>
Date: Tue, 28 May 2024 10:15:05 +0800
Subject: [PATCH] Update support OS

---
 README.md  |  2 +-
 ols1clk.sh | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0988e04..24fbfdf 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ See below for additional options and usage examples.
 | `-A` |`--adminpassword [PASSWORD]`|      To set the WebAdmin password for OpenLiteSpeed instead of using a random one.|
 |      |`--adminport [PORTNUMBER]`|          To set the WebAdmin console port number instead of 7080.|
 | `-E` |`--email [EMAIL]`|                 To set the administrator email.|
-|      |`--lsphp [VERSION]`    |           To set the LSPHP version, such as 82. We currently support versions '71 72 73 74 80 81 82'.|
+|      |`--lsphp [VERSION]`    |           To set the LSPHP version, such as 82. We currently support versions '71 72 73 74 80 81 82 83'.|
 |      |`--mariadbver [VERSION]`  |        To set MariaDB version, such as 10.9. We currently support versions '10.2 10.3 ...10.11'.|
 | `-W` |`--wordpress`|                     To install WordPress. You will still need to complete the WordPress setup by browser|
 |      |  `--wordpressplus [SITEDOMAIN]`|  To install, set up, and configure WordPress, also LSCache will be enabled|
diff --git a/ols1clk.sh b/ols1clk.sh
index c6aa571..e8948a3 100755
--- a/ols1clk.sh
+++ b/ols1clk.sh
@@ -341,7 +341,12 @@ function check_os
             OSNAMEVER=UBUNTU22
             OSVER=jammy
             MARIADBCPUARCH="arch=amd64"
-            ;;            
+            ;;          
+        noble)            
+            OSNAMEVER=UBUNTU24
+            OSVER=noble
+            MARIADBCPUARCH="arch=amd64"
+            ;;                
         esac
     elif [ -f /etc/debian_version ] ; then
         OSNAME=debian
@@ -363,11 +368,16 @@ function check_os
             OSVER=bullseye
             MARIADBCPUARCH="arch=amd64,i386"
             ;;
+        bookworm)
+            OSNAMEVER=DEBIAN12
+            OSVER=bookworm
+            MARIADBCPUARCH="arch=amd64,i386"
+            ;;            
         esac    
     fi
 
     if [ "$OSNAMEVER" = '' ] ; then
-        echoR "Sorry, currently one click installation only supports Centos(7-9), Debian(10-11) and Ubuntu(18,20,22)."
+        echoR "Sorry, currently one click installation only supports Centos(7-9), Debian(10-12) and Ubuntu(18,20,22,24)."
         echoR "You can download the source code and build from it."
         echoR "The url of the source code is https://github.com/litespeedtech/openlitespeed/releases."
         exit 1