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 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