update

3 files changed, 40 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57c7c0e11ede..df2e4e3a479e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = moonbit-bin
 	pkgdesc = Intelligent developer platform for Cloud and Edge using WASM
-	pkgver = 0.1.0.20240401
+	pkgver = 0.1.0.20240403
 	pkgrel = 1
 	url = https://www.moonbitlang.com/
 	arch = x86_64
@@ -16,11 +16,15 @@ pkgbase = moonbit-bin
 	source = https://cli.moonbitlang.com/ubuntu_x86/moonrun
 	source = https://cli.moonbitlang.com/ubuntu_x86/mooninfo
 	source = https://cli.moonbitlang.com/ubuntu_x86/moondoc
-	sha256sums = 1af8998cbbeb29fa1acaabb9dd0c6064940c9f8bb39312df28b6c98be0e4995a
-	sha256sums = bbb49fe9a94fb6b39b4a0b18aab5102f1be658157a5daea769423d6eeefdc491
-	sha256sums = 15d6e5591ddbf7264a9f50955f9cd0d033e4e790ace417ccde5969585ff5e8b7
-	sha256sums = 7d713257c2620a6551061399e02ffdf47241640b14d8ce34cc461f96b6aa514f
-	sha256sums = bab20a7cb889b4e5f342a09ae6f9c96efe1682917270fb61464828a73b81ae63
-	sha256sums = abc9cadd59e33ad2d149d4e736fc38239e877f1225c390facbc4373bc1cd748c
+	source = https://github.com/tonyfettes/moonbit-aur/releases/download/0.1.0.20240403/core.zip
+	source = moon.sh
+	sha256sums = 197b04be0e292be8a7797893695b5df0cee736975249b79f2c8919cca6bc66d0
+	sha256sums = f5766fd8737129140b2059cb8d23af00cb194b83b47fdf6bf004570fcb8f0b32
+	sha256sums = 04f74df31051bb0f16243b9ff8fb3975445b2620c4e18edbad30de0bf2adf7a0
+	sha256sums = 53842027da2c14f2bcceaa803fd0a276043e147ab2052bff8bbce6ee6955c50f
+	sha256sums = e3df89202105fe5ebdce9c8717b71059ddcd5eed60122783f93b0e4c83663183
+	sha256sums = 81f34a423b2a40ed0c499d1c148a7e33a300ce7c8505146c12586ee81a78458b
+	sha256sums = 42f13a5da7754a7e9e2c5404c1dd12df70c4cfb84f5cce8a80447d513aeabb59
+	sha256sums = 58b177a4b0dda035620b8f5f44f1f26a251203924d1df927a8a00e0a78f9c13c
 
 pkgname = moonbit-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2714afc1ee4c..bf38612ddacc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Haoxiang Fei <tonyfettes AT tonyfettes DOT com>
 
 pkgname=moonbit-bin
-pkgver=0.1.0.20240401
+pkgver=0.1.0.20240403
 pkgrel=1
 pkgdesc="Intelligent developer platform for Cloud and Edge using WASM"
 arch=('x86_64')
@@ -10,19 +10,23 @@ license=('unknown')
 depends=('glibc' 'gcc-libs' 'git')
 provides=("moonbit")
 conflicts=("moonbit")
-_download_url="https://cli.moonbitlang.com/ubuntu_x86"
-source=("${_download_url}/moon"
-        "${_download_url}/moonc"
-        "${_download_url}/moonfmt"
-        "${_download_url}/moonrun"
-        "${_download_url}/mooninfo"
-        "${_download_url}/moondoc")
-sha256sums=('1af8998cbbeb29fa1acaabb9dd0c6064940c9f8bb39312df28b6c98be0e4995a'
-            'bbb49fe9a94fb6b39b4a0b18aab5102f1be658157a5daea769423d6eeefdc491'
-            '15d6e5591ddbf7264a9f50955f9cd0d033e4e790ace417ccde5969585ff5e8b7'
-            '7d713257c2620a6551061399e02ffdf47241640b14d8ce34cc461f96b6aa514f'
-            'bab20a7cb889b4e5f342a09ae6f9c96efe1682917270fb61464828a73b81ae63'
-            'abc9cadd59e33ad2d149d4e736fc38239e877f1225c390facbc4373bc1cd748c')
+_origin="https://cli.moonbitlang.com"
+source=("${_origin}/ubuntu_x86/moon"
+        "${_origin}/ubuntu_x86/moonc"
+        "${_origin}/ubuntu_x86/moonfmt"
+        "${_origin}/ubuntu_x86/moonrun"
+        "${_origin}/ubuntu_x86/mooninfo"
+        "${_origin}/ubuntu_x86/moondoc"
+        "https://github.com/tonyfettes/moonbit-aur/releases/download/0.1.0.20240403/core.zip"
+        "moon.sh")
+sha256sums=('197b04be0e292be8a7797893695b5df0cee736975249b79f2c8919cca6bc66d0'
+            'f5766fd8737129140b2059cb8d23af00cb194b83b47fdf6bf004570fcb8f0b32'
+            '04f74df31051bb0f16243b9ff8fb3975445b2620c4e18edbad30de0bf2adf7a0'
+            '53842027da2c14f2bcceaa803fd0a276043e147ab2052bff8bbce6ee6955c50f'
+            'e3df89202105fe5ebdce9c8717b71059ddcd5eed60122783f93b0e4c83663183'
+            '81f34a423b2a40ed0c499d1c148a7e33a300ce7c8505146c12586ee81a78458b'
+            '42f13a5da7754a7e9e2c5404c1dd12df70c4cfb84f5cce8a80447d513aeabb59'
+            '58b177a4b0dda035620b8f5f44f1f26a251203924d1df927a8a00e0a78f9c13c')
 
 pkgver() {
   cd "${srcdir}"
@@ -31,10 +35,13 @@ pkgver() {
 }
 
 package() {
-  install -Dm 755 "${srcdir}/moon"     "${pkgdir}/usr/bin/moon"
+  install -Dm 755 "${srcdir}/moon"     "${pkgdir}/usr/lib/moon"
+  install -Dm 755 "${srcdir}/moon.sh"  "${pkgdir}/usr/bin/moon"
   install -Dm 755 "${srcdir}/moonc"    "${pkgdir}/usr/bin/moonc"
+  install -Dm 755 "${srcdir}/moondoc"  "${pkgdir}/usr/bin/moondoc"
   install -Dm 755 "${srcdir}/moonfmt"  "${pkgdir}/usr/bin/moonfmt"
   install -Dm 755 "${srcdir}/moonrun"  "${pkgdir}/usr/bin/moonrun"
   install -Dm 755 "${srcdir}/mooninfo" "${pkgdir}/usr/bin/mooninfo"
-  install -Dm 755 "${srcdir}/moondoc" "${pkgdir}/usr/bin/moondoc"
+  mkdir -p "${pkgdir}/usr/share/moonbit/lib"
+  cp -r "${srcdir}/core" "${pkgdir}/usr/share/moonbit/lib/"
 }
diff --git a/moon.sh b/moon.sh
new file mode 100644
index 000000000000..579d7640fa65
--- /dev/null
+++ b/moon.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+MOON_HOME="${MOON_HOME:-/usr/share/moonbit}"
+export MOON_HOME
+
+/usr/lib/moon "$@"