From 46681753cd43dd563cceea4fe422b44a77230de2 Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@scylladb.com>
Date: Thu, 16 Jan 2020 22:51:39 +0900
Subject: [PATCH] dist: add /usr/lib/scylla/jmx for compatibility (#91)

On the commit 4c8660d, we dropped /usr/lib/scylla/jmx since it likely no user
script invoke scripts under the directory.
However, we found there are possibility scylla-jmx.service tries to load .jar
file from /usr/lib/scylla/jmx, when user upgraded from older version of scylla.
Because /etc/sysconfig/scylla-jmx is marked as 'noreplace' on our rpm,
yum upgrade may keep old sysconfig file when it modified by user, that may
causes to load .jar from /usr/lib/scylla/jmx since we specify the path in the
sysconfig file.

To avoid the issue it's better to have symlinks on /usr/lib/scylla/jmx for
safety.

See #90
---
 dist/redhat/scylla-jmx.spec.mustache | 3 +++
 install.sh                           | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/dist/redhat/scylla-jmx.spec.mustache b/dist/redhat/scylla-jmx.spec.mustache
index 9d71bfb..ccfd0c7 100644
--- a/dist/redhat/scylla-jmx.spec.mustache
+++ b/dist/redhat/scylla-jmx.spec.mustache
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 /opt/scylladb/jmx/scylla-jmx
 /opt/scylladb/jmx/scylla-jmx-1.0.jar
 /opt/scylladb/jmx/symlinks/scylla-jmx
+%{_prefix}/lib/scylla/jmx/scylla-jmx
+%{_prefix}/lib/scylla/jmx/scylla-jmx-1.0.jar
+%{_prefix}/lib/scylla/jmx/symlinks/scylla-jmx
 
 %changelog
 * Fri Aug  7 2015 Takuya ASADA Takuya ASADA <syuu@cloudius-systems.com>
diff --git a/install.sh b/install.sh
index 9529047..66fcb45 100755
--- a/install.sh
+++ b/install.sh
@@ -124,6 +124,12 @@ fi
 install -m644 scylla-jmx-1.0.jar "$rprefix/jmx"
 install -m755 scylla-jmx "$rprefix/jmx"
 ln -sf /usr/bin/java "$rprefix/jmx/symlinks/scylla-jmx"
+if ! $nonroot; then
+    install -m755 -d "$rusr"/lib/scylla/jmx/symlinks
+    ln -srf "$rprefix"/jmx/scylla-jmx-1.0.jar "$rusr"/lib/scylla/jmx/
+    ln -srf "$rprefix"/jmx/scylla-jmx "$rusr"/lib/scylla/jmx/
+    ln -sf /usr/bin/java "$rusr"/lib/scylla/jmx/symlinks/scylla-jmx
+fi
 
 if $nonroot; then
     sed -i -e "s#/var/lib/scylla#$rprefix#g" "$rsysconfdir"/scylla-jmx