From 9c0fd0513f50be5ea910b9f7e30d56f532808595 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 28 Apr 2019 22:20:21 +0200 Subject: [PATCH] build-package: licenses->LICENSES --- scripts/build/termux_step_install_license.sh | 4 ++-- scripts/build/termux_step_start_build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/termux_step_install_license.sh b/scripts/build/termux_step_install_license.sh index bc7d3bc81..640857c3e 100644 --- a/scripts/build/termux_step_install_license.sh +++ b/scripts/build/termux_step_install_license.sh @@ -4,9 +4,9 @@ termux_step_install_license() { for LICENSE in $(echo $TERMUX_PKG_LICENSE | sed 's/,/ /g'); do if [ -f "$TERMUX_SCRIPTDIR/packages/termux-licenses/LICENSES/${LICENSE}.txt" ]; then if [[ $COUNTER > 0 ]]; then - ln -s "../licenses/${LICENSE}.txt" "$TERMUX_PREFIX/share/$TERMUX_PKG_NAME/LICENSE.${COUNTER}" + ln -sf "../LICENSES/${LICENSE}.txt" "$TERMUX_PREFIX/share/$TERMUX_PKG_NAME/LICENSE.${COUNTER}" else - ln -s "../licenses/${LICENSE}.txt" "$TERMUX_PREFIX/share/$TERMUX_PKG_NAME/LICENSE" + ln -sf "../LICENSES/${LICENSE}.txt" "$TERMUX_PREFIX/share/$TERMUX_PKG_NAME/LICENSE" fi else for POSSIBLE_LICENSE in "LICENSE*" "license*" "COPYRIGHT" "copyright"; do diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index b8c39361b..98e993615 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -107,7 +107,7 @@ termux_step_start_build() { "$TERMUX_PKG_TMPDIR" \ "$TERMUX_PKG_CACHEDIR" \ "$TERMUX_PKG_MASSAGEDIR" \ - $TERMUX_PREFIX/{bin,etc,lib,libexec,share,share/licenses,tmp,include} + $TERMUX_PREFIX/{bin,etc,lib,libexec,share,share/LICENSES,tmp,include} # Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build # scripts can assume that it works on both builder and host later on: