summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2022-04-07 01:43:27 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2022-04-09 15:45:06 +0700
commit314a918a767088fe05690bc986d0a54e0937f746 (patch)
treeb56e58d054ed970656087dc30004f3566fccd2d7
parentc5c3ea5f67e9ef902a6425302a59874c1fd6cb3b (diff)
downloadslackbuilds-314a918a767088fe05690bc986d0a54e0937f746.tar.gz
slackbuilds-314a918a767088fe05690bc986d0a54e0937f746.tar.xz
development/apache-jmeter: Fix docs, symlinks.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/apache-jmeter/apache-jmeter.SlackBuild25
1 files changed, 14 insertions, 11 deletions
diff --git a/development/apache-jmeter/apache-jmeter.SlackBuild b/development/apache-jmeter/apache-jmeter.SlackBuild
index a56c45b1c8..66609e632e 100644
--- a/development/apache-jmeter/apache-jmeter.SlackBuild
+++ b/development/apache-jmeter/apache-jmeter.SlackBuild
@@ -21,19 +21,21 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220407 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install docs to correct dir (/usr/doc/$PRGNAM-$VERSION).
+# - fix permissions in doc dir (dirs => 0755).
+# - use relative symlinks in /usr/bin.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=apache-jmeter
VERSION=${VERSION:-5.4.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -64,19 +66,20 @@ cp -a bin extras lib $PKG/$JMETER_HOME/
sed -i "s_\`dirname \\\"\$0\\\"\`_/$JMETER_HOME/bin_" $PKG/$JMETER_HOME/bin/jmeter
sed -i "s_\`dirname \"\$0\"\`_/$JMETER_HOME/bin_" $PKG/$JMETER_HOME/bin/jmeter-server
cd $PKG/usr/bin
- ln -s /$JMETER_HOME/bin/jmeter
- ln -s /$JMETER_HOME/bin/jmeter-server
+ ln -s ../../$JMETER_HOME/bin/jmeter
+ ln -s ../../$JMETER_HOME/bin/jmeter-server
cd $TMP/$PRGNAM-$VERSION
-mkdir -p $PKG/usr/share/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/jmeter/bin/examples $PKG/usr/share/doc/$PRGNAM-$VERSION
-cp -a LICENSE NOTICE README.md printable_docs/* $PKG/usr/share/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/jmeter/bin/examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NOTICE README.md printable_docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0755 $PKG/usr/doc/$PRGNAM-$VERSION/{*,*/*}/
if [ "$API_DOCS" = "yes" ]; then
- cp -a docs/* $PKG/usr/share/doc/$PRGNAM-$VERSION
+ cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
fi
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc