From 36acf7afb9844890ab4cdb52a8144c17f5fab6c5 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Mon, 30 Dec 2019 15:52:49 +0900 Subject: [PATCH] dist: drop symlink to scripts (#89) This is scylla-jmx part of https://github.com/scylladb/scylla/pull/5530 After we stopped replacing /usr/lib/scylla with symlink, creating symlink on /opt/scylladb/scripts/jmx become meaningless, so we can drop it now. We able to introduce new symlink on /usr/lib/scylla, but it likely no user directly invoke scripts under /usr/lib/scylla/jmx, so we don't have to do that. (cherry picked from commit 4c8660d41ad5a3c1157711a375b20af6ae28fa1d) --- dist/redhat/scylla-jmx.spec.mustache | 1 - install.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/dist/redhat/scylla-jmx.spec.mustache b/dist/redhat/scylla-jmx.spec.mustache index 714ea6b..a7f4535 100644 --- a/dist/redhat/scylla-jmx.spec.mustache +++ b/dist/redhat/scylla-jmx.spec.mustache @@ -60,7 +60,6 @@ rm -rf $RPM_BUILD_ROOT /opt/scylladb/jmx/scylla-jmx /opt/scylladb/jmx/scylla-jmx-1.0.jar /opt/scylladb/jmx/symlinks/scylla-jmx -/opt/scylladb/scripts/jmx %changelog * Fri Aug 7 2015 Takuya ASADA Takuya ASADA diff --git a/install.sh b/install.sh index 46274c0..9529047 100755 --- a/install.sh +++ b/install.sh @@ -124,8 +124,6 @@ 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" -# create symlink for /usr/lib/scylla/jmx -ln -srf $rprefix/jmx "$rprefix/scripts/" if $nonroot; then sed -i -e "s#/var/lib/scylla#$rprefix#g" "$rsysconfdir"/scylla-jmx