diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scripts/functions b/scripts/functions index 06b4769..e62fba2 100644 --- a/scripts/functions +++ b/scripts/functions @@ -543,7 +543,7 @@ CT_GetFileExtension() { # peculiar components that don't have one (such as sstrip from # buildroot). for ext in ${first_ext} $(CT_DoListTarballExt) /.git ''; do - if [ -e "${CT_TARBALLS_DIR}/${file}${ext}" ]; then + if [ -e "${CT_TARBALLS_DIR}/${file}${ext}" -o -L "${CT_TARBALLS_DIR}/${file}${ext}" ]; then echo "${ext}" exit 0 fi @@ -1103,17 +1103,11 @@ CT_Patch() { bundled_patch_dir="${CT_LIB_DIR}/patches/${pkgname}/${version}" local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkgname}/${version}" - # Check for experimental patches, if enabled. - if [ "${CT_EXPERIMENTAL_PATCHES}" = "y" ]; then - bundled_exp_patch_dir="${CT_LIB_DIR}/patches/experimental/${pkgname}/${version}" - local_exp_patch_dir="${CT_LOCAL_PATCH_DIR}/experimental/${pkgname}/${version}" - fi - case "${CT_PATCH_ORDER}" in - bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_exp_patch_dir}");; - local) patch_dirs=("${local_patch_dir}" "${local_exp_patch_dir}");; - bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_exp_patch_dir}" "${local_patch_dir}" "${local_exp_patch_dir}");; - local,bundled) patch_dirs=("${local_patch_dir}" "${local_exp_patch_dir}" "${bundled_patch_dir}" "${bundled_exp_patch_dir}");; + bundled) patch_dirs=("${bundled_patch_dir}");; + local) patch_dirs=("${local_patch_dir}");; + bundled,local) patch_dirs=("${bundled_patch_dir}" "${local_patch_dir}");; + local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}");; none) patch_dirs=;; esac |