sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-package.sh: fix bug in the case where package name contains (but not ends with) -dev

Browse Source 
As for icu-devtools
This commit is contained in:
Henrik Grimler 2019-01-20 18:20:56 +01:00
parent ede80c5d9d
commit f3f479faf6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-package.sh
View File

@ -435,8 +435,8 @@ termux_step_handle_buildarch() {
# Function to get TERMUX_PKG_VERSION from build.sh # Function to get TERMUX_PKG_VERSION from build.sh
termux_extract_dep_info() { termux_extract_dep_info() {
package=$1 package=$1
if [ ! -d packages/$package ] && [ packages/${package} == packages/${package/-dev/} ]; then if [ ! -d packages/$package ] && [ -f packages/*/${package}.subpackage.sh ]; then
# We are probably dealing with a subpackage # We are dealing with a subpackage
TERMUX_ARCH=$( TERMUX_ARCH=$(
# set TERMUX_SUBPKG_PLATFORM_INDEPENDENT to mother package's value and override if needed # set TERMUX_SUBPKG_PLATFORM_INDEPENDENT to mother package's value and override if needed
TERMUX_PKG_PLATFORM_INDEPENDENT="" TERMUX_PKG_PLATFORM_INDEPENDENT=""
@ -451,7 +451,7 @@ termux_extract_dep_info() {
) )
package=$(basename $(dirname $(find packages/ -name "$package.subpackage.sh"))) package=$(basename $(dirname $(find packages/ -name "$package.subpackage.sh")))
elif [ ! packages/${package} == packages/${package/-dev/} ]; then elif [ "${package/-dev/}-dev" == "${package}" ]; then
# dev package # dev package
package=${package/-dev/} package=${package/-dev/}
fi fi