Follow master branch instead of latest release

3 files changed, 19 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e0098e7e2d2..a46e7acda9d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = emqx-git
 	pkgdesc = EMQX, a distributed, massively scalable, highly extensible MQTT message broker.
-	pkgver = 5.0.2
+	pkgver = 5.0.3.45
 	pkgrel = 1
 	url = https://github.com/emqx/emqx
 	install = emqx.install
diff --git a/PKGBUILD b/PKGBUILD
index fdf82892059d..185005c38833 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ LATEST_INFO="$(curl -s https://api.github.com/repos/${ORG_NAME}/${REPO_NAME}/rel
 TAG=$(echo "$LATEST_INFO" | grep "tag_name" | cut -d'"' -f4)
 
 pkgname=$REPO_NAME-git
-pkgver="${TAG//v/}"
+pkgver=5.0.3.45
 pkgrel=1
 pkgdesc="EMQX, a distributed, massively scalable, highly extensible MQTT message broker."
 arch=('x86_64')
@@ -34,12 +34,8 @@ install=$REPO_NAME.install
 options=()
 
 pkgver() {
-    echo "${TAG//v/}"
-}
-
-prepare() {
-    cd "$srcdir/$REPO_NAME" || exit
-    git checkout "$TAG"
+    cd "$srcdir"/$REPO_NAME || exit
+    echo "$TAG.$(git rev-list "$TAG"..HEAD --count)" | sed 's/v//g'
 }
 
 build() {
@@ -48,20 +44,25 @@ build() {
 }
 
 package() {
+    install -d "$pkgdir"/usr/bin
     install -d "$pkgdir"/usr/lib/emqx/bin
     install -d "$pkgdir"/usr/lib/emqx/plugins
     install -d "$pkgdir"/usr/lib/emqx/releases
-    install -d "$pkgdir"/etc/emqx
+    install -d "$pkgdir"/usr/lib/emqx/lib
+    install -d "$pkgdir"/etc/
     install -d "$pkgdir"/var/lib/emqx
     install -d "$pkgdir"/var/log/emqx
 
-    local buildDir="$srcdir"/emqx/_build/emqx/rel/emqx
     touch "$pkgdir"/usr/lib/emqx/plugins/.keep
-    find "$buildDir"/bin/ -type f -exec install -D -m 755 {} "$pkgdir/usr/lib/emqx/bin/$(basename "$1")" \;
-    find "$buildDir"/etc/ -type f -exec install -D -m 644 {} "$pkgdir/etc/emqx/$(basename "$1")" \;
-    find "$buildDir"/data/ -type f -exec install -D -m 644 {} "$pkgdir/var/lib/emqx/$(basename "$1")" \;
-    find "$buildDir"/lib/ -type f -exec install -D -m 644 {} "$pkgdir/usr/lib/emqx/$(basename "$1")" \;
-    find "$buildDir"/releases/ -type f -exec install -D -m 644 {} "$pkgdir/usr/lib/emqx/$(basename "$1")" \;
-    find "$buildDir"/erts*/ -type f -exec install -D -m 644 {} "$pkgdir/usr/lib/emqx/$(basename "$(dirname "$1")")/$(basename "$1")" \;
+    cp -ar "$srcdir"/emqx/_build/emqx/rel/emqx/bin "$pkgdir"/usr/lib/emqx/
+    chmod +x "$pkgdir"/usr/lib/emqx/*
+    ln -s /usr/lib/emqx/bin/emqx "$pkgdir"/usr/bin/emqx
+    ln -s /usr/lib/emqx/bin/emqx_ctl "$pkgdir"/usr/bin/emqx_ctl
+    cp -ar "$srcdir"/emqx/_build/emqx/rel/emqx/etc "$pkgdir"/usr/lib/emqx/
+    ln -s /var/lib/emqx/etc "$pkgdir"/etc/emqx
+    cp -ar "$srcdir"/emqx/_build/emqx/rel/emqx/data/* "$pkgdir"/var/lib/emqx/
+    cp -ar "$srcdir"/emqx/_build/emqx/rel/emqx/lib "$pkgdir"/usr/lib/emqx/
+    cp -ar "$srcdir"/emqx/_build/emqx/rel/emqx/releases "$pkgdir"/usr/lib/emqx/
+    cp -ar "$srcdir"/emqx/_build/emqx/rel/emqx/erts* "$pkgdir"/usr/lib/emqx/
     install -D -m 644 "$srcdir"/emqx/deploy/packages/emqx.service "$pkgdir"/usr/lib/systemd/system/emqx.service
 }
diff --git a/emqx.install b/emqx.install
index 8e7bb3ce1398..932846c70d64 100644
--- a/emqx.install
+++ b/emqx.install
@@ -9,6 +9,7 @@ post_install() {
 
     chown -R emqx:emqx /var/lib/emqx
     chown -R emqx:emqx /var/log/emqx
+    chown -R emqx:emqx /usr/lib/emqx
     systemctl daemon-reload
 }
 
@@ -23,6 +24,7 @@ post_install() {
 post_upgrade() {
     chown -R emqx:emqx /var/lib/emqx
     chown -R emqx:emqx /var/log/emqx
+    chown -R emqx:emqx /usr/lib/emqx
     systemctl daemon-reload
 }