From 981b563bd05757714e65be0cdcd0d3b2260f604e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=9010?= <0w0@0w0.pw>
Date: Thu, 18 Apr 2024 04:22:36 +0800
Subject: [PATCH 1/3] Upgrade xmake version to 2.8.9

---
 build.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 589021f..fc115f5 100755
--- a/build.sh
+++ b/build.sh
@@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
     esac
 done
 
-XMAKE_VERSION="2.6.1"
+XMAKE_VERSION="2.8.9"
 
 # Get current dir
 CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -229,12 +229,10 @@ if [[ ! -d "$XMAKE_DIR" ]] || [[ ! -x "$xmake" ]]; then
     fi
 
     log-8601-local "Downloading and building xmake, this might take a while..."
-    if commands_exist xz; then
-        pack=xz
-    elif command_exist gzip; then
+    if commands_exist gzip; then
         pack=gz
     else
-        msg-error "No decompression binary found, please install xz or gzip to continue"
+        msg-error "No decompression binary found, please install gzip to continue"
     fi
 
     log-8601-local "Downloading xmake runner..."
@@ -263,4 +261,4 @@ do
     log-8601-local "Building for $arch..."
     "$xmake" f -a $arch -m $PROFILE --include_logging=$WITH_LOGGING
     "$xmake" "$@"
-done
\ No newline at end of file
+done

From c869002ea8281fd3b639bdb96c35589606fe2a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=9010?= <0w0@0w0.pw>
Date: Thu, 18 Apr 2024 04:29:55 +0800
Subject: [PATCH 2/3] Run configure before build xmake

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index fc115f5..c8fe1b7 100755
--- a/build.sh
+++ b/build.sh
@@ -247,7 +247,7 @@ if [[ ! -d "$XMAKE_DIR" ]] || [[ ! -x "$xmake" ]]; then
         exit 1
     fi
     log-8601-local "Installing xmake..."
-    if (cd "$XMAKE_BUILD_DIR" && DESTDIR="$TOOLS_DIR" PREFIX="xmake" $make install); then
+    if (cd "$XMAKE_BUILD_DIR" && ./configure && DESTDIR="$TOOLS_DIR" PREFIX="xmake" $make install); then
         msg-success "xmake installed successfully"
     else
         msg-error "Failed to install xmake"

From 1614de5438d376c3dc1482e0c094abd5050e131e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=9010?= <0w0@0w0.pw>
Date: Thu, 18 Apr 2024 04:34:56 +0800
Subject: [PATCH 3/3] Remove make build

---
 build.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index c8fe1b7..170c88e 100755
--- a/build.sh
+++ b/build.sh
@@ -239,14 +239,7 @@ if [[ ! -d "$XMAKE_DIR" ]] || [[ ! -x "$xmake" ]]; then
     curl -fSL "https://github.com/xmake-io/xmake/releases/download/v$XMAKE_VERSION/xmake-v$XMAKE_VERSION.$pack.run" > "$TOOLS_DIR/xmake.run"
     log-8601-local "Downloading xmake maybe..."
     sh "$TOOLS_DIR/xmake.run" --noexec --target "$XMAKE_BUILD_DIR"
-    log-8601-local "Building xmake..."
-    if (cd "$XMAKE_BUILD_DIR" && $make build); then
-        msg-success "Build successful"
-    else
-        msg-error "Failed to build xmake"
-        exit 1
-    fi
-    log-8601-local "Installing xmake..."
+    log-8601-local "Buinding and installing xmake..."
     if (cd "$XMAKE_BUILD_DIR" && ./configure && DESTDIR="$TOOLS_DIR" PREFIX="xmake" $make install); then
         msg-success "xmake installed successfully"
     else