[arch-commits] Commit in opensearch-dashboards/trunk (PKGBUILD tmpfile.conf)

[Justin Kromlinger]

    Date: Friday, January 28, 2022 @ 11:41:23
  Author: hashworks
Revision: 1118307

upgpkg: opensearch-dashboards 1.2.0-2

Removes the runtime nodejs version check, see:
https://github.com/opensearch-project/project-website/pull/642

Modified:
  opensearch-dashboards/trunk/PKGBUILD
  opensearch-dashboards/trunk/tmpfile.conf

--------------+
 PKGBUILD     |   13 ++++---------
 tmpfile.conf |    6 +++---
 2 files changed, 7 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-28 11:18:55 UTC (rev 1118306)
+++ PKGBUILD	2022-01-28 11:41:23 UTC (rev 1118307)
@@ -5,7 +5,7 @@
 
 pkgname=opensearch-dashboards
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source visualization dashboards for OpenSearch'
 url='https://opensearch.org/docs/dashboards/index/'
 arch=('x86_64')
@@ -13,7 +13,6 @@
 depends=('nodejs-lts-erbium')
 optdepends=(
   'opensearch'
-  #'nodejs: System nodejs instead of the included version'
 )
 makedepends=('yarn' 'git' 'python')
 backup=('etc/opensearch-dashboards/opensearch_dashboards.yml')
@@ -20,7 +19,6 @@
 options=('!strip' 'emptydirs')
 source=(
   "git+https://github.com/opensearch-project/OpenSearch-Dashboards.git#tag=${pkgver}"
-  #"https://artifacts.opensearch.org/releases/core/${pkgname}/${pkgver}/${pkgname}-min-${pkgver}-linux-x64.tar.gz"{,.sig}
   opensearch-dashboards
   opensearch-dashboards-keystore
   opensearch-dashboards-plugin
@@ -28,17 +26,15 @@
   tmpfile.conf
   user.conf
 )
-#validpgpkeys=('C5B7498965EFD1C2924BA9D539D319879310D3FC') # OpenSearch project <opensearch at amazon.com>
 sha512sums=('SKIP'
             'c404c8f576ccc5d9202b6808eaf0ec4a1545eec63480ea5189f0f5b66f3e22f431090ece3e7488f6e7d20472e55e784110d4d393bef94ad959c8ee0665290d36'
             '55bb1b7e86bafb9938b787c973aab318848bdb7a498d547948d58ee06fc8b96f9a184d6c00a9f1e7accb5caf64992b0db86cf4b31b0d0eb66c8a88f09b609d3e'
             'bd3bb6a1d64b80bc0a5a5d73ccce7689b8aaf035262424414de404083085ae8e482770f62e5d8219313adeecd65003b7ce1bbe8943418dbd6a432e739e124493'
             'bec175171d7ce2d9769b4247931f13e73713f6f6f5eba1c1c184c450e694ae52e54d16e79853331df5fa6b50ebc42e1408cf022dbb8e025526c9be783dfca5c2'
-            'b310d30d6c307106985fe9d835eae6b98241fbf37165cffee134b9e4ba8a2b96a43340fe4cc6276c7b48a7230611815aa8e5acc70348e30a21fd473c7a56f06a'
+            'ee7a82eb8b5a719913250159485b144ab94219e64f09a73210bd4cf82345e4f7d1b594e6e8d67aca7faaf6087a672bec478f19ce1493ca64d42e6c39f6b586b8'
             '51cef07f4f4cdd467aa4a2665ee8aaa870ea8f11449f4be1cb239826292ee4044cc656204ab8836730ac1555387ddb20c2cfb9a50ba70f5c5fe59c271a332ab4')
 
 prepare() {
-  #cd "${pkgbase}-${pkgver}-linux-x64"
   cd "OpenSearch-Dashboards"
 
   nodeVersion="$(node -v)"
@@ -45,9 +41,8 @@
   # Yes, you support this version. You just don't know it yet.
   sed -i "s/    \"node\": \"[0-9\.]*\",/    \"node\": \"${nodeVersion:1}\",/" "package.json"
 
-  # Remove nodejs strict version requirements
-  # Since we use the included node this isn't required, but we want to give users the option to use the system nodejs
-  #sed "s@^var isVersionValid = .*@var isVersionValid = true;@" -i src/setup_node_env/node_version_validator.js
+  # Don't check the nodejs version for now until https://github.com/opensearch-project/OpenSearch-Dashboards/issues/920
+  sed -i "/^require('.\/node_version_validator');$/d" src/setup_node_env/no_transpilation.js
 
   # set default quiet mode for systemd, cli option forces specified values
   sed -r 's|#(logging.quiet:) false|\1 true|' -i config/opensearch_dashboards.yml

Modified: tmpfile.conf
===================================================================
--- tmpfile.conf	2022-01-28 11:18:55 UTC (rev 1118306)
+++ tmpfile.conf	2022-01-28 11:41:23 UTC (rev 1118307)
@@ -1,6 +1,6 @@
-d /etc/opensearch-dashboards 0750 opensearch-dashboards opensearch-dashboards -
-Z /etc/opensearch-dashboards/node.options 0640 opensearch-dashboards opensearch-dashboards - /etc/opensearch-dashboards/node.options 0640 opensearch-dashboards opensearch-dashboards -
+d /etc/opensearch-dashboards 0755 opensearch-dashboards opensearch-dashboards -
+Z /etc/opensearch-dashboards/node.options 0640 opensearch-dashboards opensearch-dashboards -
 Z /etc/opensearch-dashboards/opensearch_dashboards.yml 0640 opensearch-dashboards opensearch-dashboards -
 d /usr/share/opensearch-dashboards 0755 opensearch-dashboards opensearch-dashboards -
 Z /usr/share/opensearch-dashboards/optimize - opensearch-dashboards opensearch-dashboards -
-Z /usr/share/opensearch-dashboards/data - opensearch-dashboards opensearch-dashboards -
+d /var/lib/opensearch-dashboards 0755 opensearch-dashboards opensearch-dashboards -
\ No newline at end of file