Skip to content

The Unified and Autonomous Development Platform

chore: Remove legacy macOS wrapper executable alias

Robin Shen663a43f46ea9
diff --git a/server-product/wrapper/README.md b/server-product/wrapper/README.md
index 0b98dbb758..17cfe75d94 100644
--- a/server-product/wrapper/README.md
+++ b/server-product/wrapper/README.md
@@ -64,8 +64,8 @@ and its `.sha256` together, then run:
```
The importer verifies the archive and file checksums, copies all upstream boot
-files, adapts generic launchers for server/agent and one-shot utilities, and creates
-the legacy macOS executable alias. It renders server and agent configurations from
+files and adapts generic launchers for server/agent and one-shot utilities.
+It renders server and agent configurations from
`wrapper.conf` and regenerates `SHA256SUMS`. These integration rules live in the
server project. The agent configuration retains the `agentVersion` placeholder,
which is resolved when assembling a standalone agent or downloading one.
diff --git a/server-product/wrapper/SHA256SUMS b/server-product/wrapper/SHA256SUMS
index 5da613e803..35436616f3 100644
--- a/server-product/wrapper/SHA256SUMS
+++ b/server-product/wrapper/SHA256SUMS
@@ -1,11 +1,10 @@
-0224c7f0fffc23012d32529affa53b7ae58837b852ad800435e9f97b87c11e54 README.md
+463795ade51ad5269bfddc8d0bd1f57846fa03811e7c05bd97cdcd232e70bb29 README.md
0f8fee02328a33ee30e1ecf2b9029eb41ae72f34bbc1ae451ddb74a581190e06 VERSION
c6903c9ebecb69dc27eaa89ce133bd6e17db178dc2d88b62c323c06a3ed761d5 distribution/agent/bin/agent.bat
70d482d8b4f323a92ebe9e94c1cfcfd90a3acc9a6dc405bbf642f9ce84aad003 distribution/agent/bin/agent.sh
1102c500067c908f941a6a105c9563a89a760664cbfdc2519befa8645b5c381c distribution/agent/boot/wrapper-linux-arm-64
ac78e3982c0558116a5f3d112a315af63695ebc21562c542c30a08a54d7d6e0a distribution/agent/boot/wrapper-linux-x86-64
ec378dbd20a8da8cda8cf117439f9745052bd65138ab8dad1a060405d94c13b4 distribution/agent/boot/wrapper-macosx-arm-64
-ec378dbd20a8da8cda8cf117439f9745052bd65138ab8dad1a060405d94c13b4 distribution/agent/boot/wrapper-macosx-universal-64
bb04575c2447d5ddf55ec557aa7b0abc1fc043ef78d907e240a4e7865ff624e9 distribution/agent/boot/wrapper-windows-arm-64.exe
44f97fc340909a9ed2e424376c75fc45bfc57d6f7acee5f0d7f919935116aa40 distribution/agent/boot/wrapper-windows-x86-64.exe
69d7163492f1f8f8423d1eb3ab32a7843dfd8cc88213b3bfa1f09141b0704a08 distribution/agent/boot/wrapper.jar
@@ -27,10 +26,9 @@ c6903c9ebecb69dc27eaa89ce133bd6e17db178dc2d88b62c323c06a3ed761d5 distribution/b
1102c500067c908f941a6a105c9563a89a760664cbfdc2519befa8645b5c381c distribution/boot/wrapper-linux-arm-64
ac78e3982c0558116a5f3d112a315af63695ebc21562c542c30a08a54d7d6e0a distribution/boot/wrapper-linux-x86-64
ec378dbd20a8da8cda8cf117439f9745052bd65138ab8dad1a060405d94c13b4 distribution/boot/wrapper-macosx-arm-64
-ec378dbd20a8da8cda8cf117439f9745052bd65138ab8dad1a060405d94c13b4 distribution/boot/wrapper-macosx-universal-64
bb04575c2447d5ddf55ec557aa7b0abc1fc043ef78d907e240a4e7865ff624e9 distribution/boot/wrapper-windows-arm-64.exe
44f97fc340909a9ed2e424376c75fc45bfc57d6f7acee5f0d7f919935116aa40 distribution/boot/wrapper-windows-x86-64.exe
69d7163492f1f8f8423d1eb3ab32a7843dfd8cc88213b3bfa1f09141b0704a08 distribution/boot/wrapper.jar
6681dd61fd63979af05ff6fffc36be43f50d61b7bc89edafb9614d6fa3440998 distribution/conf/wrapper.conf
-669c35b4e855b957ec4b712330e9b3f253863ef6463a890148b765482dd65997 update.sh
+4c5d90f48e3f678fbf9d66a79267d65e9fb1d493c4d339e8bbf6b6f2934312ae update.sh
71cce4154ef69e1e0630f751ec16ff18096f3f174685811f33246aa8d73bbce9 wrapper.conf
diff --git a/server-product/wrapper/distribution/agent/boot/wrapper-macosx-universal-64 b/server-product/wrapper/distribution/agent/boot/wrapper-macosx-universal-64
deleted file mode 100755
index fe3bea5e60..0000000000
Binary files a/server-product/wrapper/distribution/agent/boot/wrapper-macosx-universal-64 and /dev/null differ
diff --git a/server-product/wrapper/distribution/boot/wrapper-macosx-universal-64 b/server-product/wrapper/distribution/boot/wrapper-macosx-universal-64
deleted file mode 100755
index fe3bea5e60..0000000000
Binary files a/server-product/wrapper/distribution/boot/wrapper-macosx-universal-64 and /dev/null differ
diff --git a/server-product/wrapper/update.sh b/server-product/wrapper/update.sh
index 42e92095a6..5c3944a7df 100755
--- a/server-product/wrapper/update.sh
+++ b/server-product/wrapper/update.sh
@@ -170,7 +170,6 @@ prepare_distribution() (
rm -rf "$distribution"
mkdir -p "$distribution/bin" "$distribution/conf" "$distribution/agent/bin" "$distribution/agent/conf"
cp -R "$release/boot" "$distribution/boot"
- cp "$distribution/boot/wrapper-macosx-arm-64" "$distribution/boot/wrapper-macosx-universal-64"
cp -R "$distribution/boot" "$distribution/agent/boot"
for extension in sh bat; do
launcher="$release/bin/service.$extension"
@@ -446,7 +445,6 @@ test_wrapper() (
[ -x "$distribution/bin/backup-db.sh" ]
[ -x "$distribution/boot/wrapper-linux-x86-64" ]
[ ! -x "$distribution/boot/wrapper.jar" ]
- cmp "$distribution/boot/wrapper-macosx-arm-64" "$distribution/boot/wrapper-macosx-universal-64"
grep -q io.onedev.commons.bootstrap.Bootstrap "$distribution/conf/wrapper.conf"
grep -q io.onedev.agent.Agent "$distribution/agent/conf/wrapper.conf"
grep -Fq '../lib/agentVersion/*.jar' "$distribution/agent/conf/wrapper.conf"