Using Arch file structure for java packages

5 files changed, 32 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0116fc32d1b5..4bc4411d34c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
 pkgbase = metabase
 	pkgdesc = The simplest, fastest way to get business intelligence and analytics to everyone in your company
 	pkgver = 0.46.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.metabase.com/
 	arch = x86_64
+	arch = aarch64
 	license = AGPL
 	depends = jre-openjdk-headless
 	noextract = metabase.jar
 	options = !strip
 	backup = etc/metabase.conf
 	source = https://downloads.metabase.com/v0.46.6/metabase.jar
+	source = metabase
 	source = metabase.conf
 	source = metabase.service
 	source = metabase.sysusers
 	source = metabase.tmpfiles
 	sha256sums = 8511069190e54d08cdd35dbf89333c2031eb5bbdb637ee20546b6c547e91e64a
-	sha256sums = 911f8e307d972cf965bd26314b3eaa29debb370f661843b08da04e32ce9e826f
-	sha256sums = 63e23295b3a94eaa5a4e9fc18b51328d55a4a689170f4f0f5766a9b3a9433a1b
+	sha256sums = f26e51e69a188c7eea8dc65f192d326d1ae7009032cd521c798a862d7fbc5365
+	sha256sums = 0135dce8719bf676eb44139776124f1cc8f4ecb53d973e2d78982ab210ce1868
+	sha256sums = 706ec71333804e97429f91c19ff72004a050a24307560b8a2fc4e6db7915964d
 	sha256sums = c670b2c4c4663590ab2ced38b19b196f1b31ab1c6339ef7caa9225e94db82c92
 	sha256sums = 71478a76412929d5d35ce8aafb85a27a3c73b10a37235ed2ad890c47cb31812b
 
diff --git a/PKGBUILD b/PKGBUILD
index ebc57da33cbb..05fd5ce28670 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,38 @@
 # Maintainer: AlphaJack <alphajack at tuta dot io>
 
+# https://wiki.archlinux.org/title/Java_package_guidelines
+# https://www.metabase.com/docs/latest/installation-and-operation/running-the-metabase-jar-file
+# https://www.metabase.com/docs/latest/installation-and-operation/running-metabase-on-debian
+
 pkgname="metabase"
 pkgver=0.46.6
-pkgrel=1
+pkgrel=2
 pkgdesc="The simplest, fastest way to get business intelligence and analytics to everyone in your company"
-arch=("x86_64")
+arch=("x86_64" "aarch64")
 url="https://www.metabase.com/"
 license=("AGPL")
 depends=("jre-openjdk-headless")
 source=("https://downloads.metabase.com/v$pkgver/metabase.jar"
+        "metabase"
         "metabase.conf"
         "metabase.service"
         "metabase.sysusers"
         "metabase.tmpfiles"
         )
 sha256sums=('8511069190e54d08cdd35dbf89333c2031eb5bbdb637ee20546b6c547e91e64a'
-            '911f8e307d972cf965bd26314b3eaa29debb370f661843b08da04e32ce9e826f'
-            '63e23295b3a94eaa5a4e9fc18b51328d55a4a689170f4f0f5766a9b3a9433a1b'
+            'f26e51e69a188c7eea8dc65f192d326d1ae7009032cd521c798a862d7fbc5365'
+            '0135dce8719bf676eb44139776124f1cc8f4ecb53d973e2d78982ab210ce1868'
+            '706ec71333804e97429f91c19ff72004a050a24307560b8a2fc4e6db7915964d'
             'c670b2c4c4663590ab2ced38b19b196f1b31ab1c6339ef7caa9225e94db82c92'
             '71478a76412929d5d35ce8aafb85a27a3c73b10a37235ed2ad890c47cb31812b')
 noextract=("metabase.jar")
 options=("!strip")
 backup=("etc/metabase.conf")
 
-# https://www.metabase.com/docs/latest/installation-and-operation/running-the-metabase-jar-file
-# https://www.metabase.com/docs/latest/installation-and-operation/running-metabase-on-debian
-
 package(){
  install -d -m 750 "$pkgdir/var/lib/metabase"
- install -D -m 755 "metabase.jar" "$pkgdir/usr/bin/metabase"
+ install -D -m 755 "metabase" "$pkgdir/usr/bin/metabase"
+ install -D -m 644 "metabase.jar" "$pkgdir/usr/share/java/metabase/metabase.jar"
  install -D -m 640 "metabase.conf" "$pkgdir/etc/metabase.conf"
  install -D -m 644 "metabase.service" "$pkgdir/usr/lib/systemd/system/metabase.service"
  install -D -m 644 "metabase.sysusers" "$pkgdir/usr/lib/sysusers.d/metabase.conf"
diff --git a/metabase b/metabase
new file mode 100755
index 000000000000..b0196e94a97b
--- /dev/null
+++ b/metabase
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -jar "/usr/share/java/metabase/metabase.jar" "$@"
diff --git a/metabase.conf b/metabase.conf
index 335dcb86b3f7..08219988b6bc 100644
--- a/metabase.conf
+++ b/metabase.conf
@@ -1,12 +1,14 @@
-#MB_PASSWORD_COMPLEXITY=<weak|normal|strong>
-#MB_PASSWORD_LENGTH=<10>
+# https://www.metabase.com/docs/latest/configuring-metabase/environment-variables
+
 MB_JETTY_HOST=127.0.0.1
 MB_JETTY_PORT=3000
+MB_ANON_TRACKING_ENABLED=false
+MB_CHECK_FOR_UPDATES=false
 #MB_DB_TYPE=<postgres|mysql|h2>
-#MB_DB_DBNAME=<your_metabase_db_name>
-#MB_DB_PORT=<5432>
-#MB_DB_USER=<your_metabase_db_user>
-#MB_DB_PASS=<ssshhhh>
-#MB_DB_HOST=<localhost>
-#MB_EMOJI_IN_LOGS=<true|false>
-# any other env vars you want available to Metabase
+#MB_DB_HOST=127.0.0.1
+#MB_DB_PORT=5432
+#MB_DB_USER=metabase
+#MB_DB_PASS=XXXXXX
+#MB_DB_DBNAME=metabasedb
+
+
diff --git a/metabase.service b/metabase.service
index 32a36e2ced03..02b92961f8e1 100644
--- a/metabase.service
+++ b/metabase.service
@@ -6,7 +6,7 @@ After=network-online.target
 User=metabase
 EnvironmentFile=/etc/metabase.conf
 WorkingDirectory=/var/lib/metabase
-ExecStart=/usr/bin/java -jar /usr/bin/metabase
+ExecStart=/usr/bin/metabase
 Type=simple
 SyslogIdentifier=metabase
 SuccessExitStatus=143