From b6a63ecbb2c4becfda8506509ff77cee65a8006c Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Tue, 3 Jan 2023 19:01:08 +0000 Subject: [PATCH] Update repo --- scripts/build/termux_step_get_dependencies.sh | 8 ++++---- scripts/build/termux_step_massage.sh | 2 +- scripts/utils/package/package.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/build/termux_step_get_dependencies.sh b/scripts/build/termux_step_get_dependencies.sh index 758988db0c..5036e3dbf9 100644 --- a/scripts/build/termux_step_get_dependencies.sh +++ b/scripts/build/termux_step_get_dependencies.sh @@ -25,7 +25,7 @@ termux_step_get_dependencies() { read DEP_ARCH DEP_VERSION DEP_VERSION_PAC <<< $(termux_extract_dep_info $PKG "${PKG_DIR}") [ ! "$TERMUX_QUIET_BUILD" = true ] && echo "Downloading dependency $PKG@$DEP_VERSION if necessary..." local force_build_dependency="$TERMUX_FORCE_BUILD_DEPENDENCIES" - if [ "$TERMUX_FORCE_BUILD_DEPENDENCIES" = "true" ] && [ "$TERMUX_ON_DEVICE_BUILD" = "true" ] && ! pacakge__is_package_on_device_build_supported "$PKG_DIR"; then + if [ "$TERMUX_FORCE_BUILD_DEPENDENCIES" = "true" ] && [ "$TERMUX_ON_DEVICE_BUILD" = "true" ] && ! package__is_package_on_device_build_supported "$PKG_DIR"; then echo "Building dependency $PKG on device is not supported. It will be downloaded..." force_build_dependency="false" fi @@ -35,7 +35,7 @@ termux_step_get_dependencies() { termux_force_check_package_dependency && continue build_dependency=true else - if pacakge__is_package_version_built "$PKG" "$DEP_VERSION"; then + if package__is_package_version_built "$PKG" "$DEP_VERSION"; then [ ! "$TERMUX_QUIET_BUILD" = true ] && echo "Skipping already built dependency $PKG@$DEP_VERSION" continue fi @@ -83,7 +83,7 @@ termux_step_get_dependencies() { # Built dependencies are put in the default TERMUX_OUTPUT_DIR instead of the specified one if [ "$TERMUX_FORCE_BUILD_DEPENDENCIES" = "true" ]; then [ ! "$TERMUX_QUIET_BUILD" = true ] && echo "Force building dependency $PKG..." - if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ] && ! pacakge__is_package_on_device_build_supported "$PKG_DIR"; then + if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ] && ! package__is_package_on_device_build_supported "$PKG_DIR"; then echo "Building $PKG on device is not supported. Consider passing -I flag to download it instead" return 1 fi @@ -98,7 +98,7 @@ termux_step_get_dependencies() { } termux_force_check_package_dependency() { - if termux_check_package_in_built_packages_list "$PKG" && pacakge__is_package_version_built "$PKG" "$DEP_VERSION"; then + if termux_check_package_in_built_packages_list "$PKG" && package__is_package_version_built "$PKG" "$DEP_VERSION"; then [ ! "$TERMUX_QUIET_BUILD" = true ] && echo "Skipping already built dependency $PKG@$DEP_VERSION" return 0 fi diff --git a/scripts/build/termux_step_massage.sh b/scripts/build/termux_step_massage.sh index c2ad1be5f9..b63c59200a 100644 --- a/scripts/build/termux_step_massage.sh +++ b/scripts/build/termux_step_massage.sh @@ -107,7 +107,7 @@ termux_step_massage() { termux_create_pacman_subpackages fi - # Remove unnecessary files in haskell pacakges: + # Remove unnecessary files in haskell packages: if [[ "${TERMUX_PKG_NAME}" != "ghc-libs" ]] && [[ "${TERMUX_PKG_NAME}" != "ghc" ]]; then test -d ./lib/ghc-* && rm -rf ./lib/ghc-* 2>/dev/null # Remove full ghc-* dir since cross compiler installs packages in "./lib/${TERMUX_ARCH}-android-ghc-X.Y.Z" fi diff --git a/scripts/utils/package/package.sh b/scripts/utils/package/package.sh index a11be7da99..a23a5b1aee 100644 --- a/scripts/utils/package/package.sh +++ b/scripts/utils/package/package.sh @@ -19,9 +19,9 @@ # Returns `0` if supported, otherwise `1`. # . # . -# pacakge__is_package_on_device_build_supported `package_dir` +# package__is_package_on_device_build_supported `package_dir` ## -pacakge__is_package_on_device_build_supported() { +package__is_package_on_device_build_supported() { [ $(. "${1}/build.sh"; echo "$TERMUX_PKG_ON_DEVICE_BUILD_NOT_SUPPORTED") != "true" ] return $? } @@ -41,9 +41,9 @@ pacakge__is_package_on_device_build_supported() { # Returns `0` if built, otherwise `1`. # . # . -# pacakge__is_package_version_built `package_name` `package_version` +# package__is_package_version_built `package_name` `package_version` ## -pacakge__is_package_version_built() { +package__is_package_version_built() { [ -e "$TERMUX_BUILT_PACKAGES_DIRECTORY/$1" ] && [ "$(cat "$TERMUX_BUILT_PACKAGES_DIRECTORY/$1")" = "$2" ] return $? }