From 24eeba66ab03dd44392ac8e329f3535db0f0c432 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 10 Mar 2022 20:48:11 +0100 Subject: [PATCH] asciidoctor: update to 2.0.17 --- packages/asciidoctor/build.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/asciidoctor/build.sh b/packages/asciidoctor/build.sh index f5ecd403e..b7f1c9050 100644 --- a/packages/asciidoctor/build.sh +++ b/packages/asciidoctor/build.sh @@ -2,17 +2,18 @@ TERMUX_PKG_HOMEPAGE=https://asciidoctor.org/ TERMUX_PKG_DESCRIPTION="An implementation of AsciiDoc in Ruby" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.0.16 +TERMUX_PKG_VERSION=2.0.17 TERMUX_PKG_DEPENDS="ruby" TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true -_RUBY_VERSION=2.7 - +termux_step_pre_configure() { + ruby_version=$(. $TERMUX_SCRIPTDIR/packages/ruby/build.sh; echo $TERMUX_PKG_VERSION) +} termux_step_make_install() { - local gemdir="$TERMUX_PREFIX/lib/ruby/gems/${_RUBY_VERSION}.0" + local gemdir="$TERMUX_PREFIX/lib/ruby/gems/${ruby_version:0:3}.0" rm -rf "$gemdir/asciidoctor-$TERMUX_PKG_VERSION" rm -rf "$gemdir/doc/asciidoctor-$TERMUX_PKG_VERSION" @@ -28,7 +29,8 @@ termux_step_make_install() { } termux_step_install_license() { - local gemdir="$TERMUX_PREFIX/lib/ruby/gems/${_RUBY_VERSION}.0" + local gemdir="$TERMUX_PREFIX/lib/ruby/gems/${ruby_version:0:3}.0" mkdir -p $TERMUX_PREFIX/share/doc/asciidoctor - cp $gemdir/gems/asciidoctor-${TERMUX_PKG_VERSION}/LICENSE $TERMUX_PREFIX/share/doc/asciidoctor/ + cp $gemdir/gems/asciidoctor-${TERMUX_PKG_VERSION}/LICENSE \ + $TERMUX_PREFIX/share/doc/asciidoctor/ }