lib.sh: Fix bash regex

pull/57/merge
Jesus Alvarez 9 years ago
parent d05fe95a2a
commit 3307a0a08a
  1. 2
      build.sh
  2. 6
      lib.sh

@ -348,8 +348,10 @@ if [[ $AZB_UPDPKGSUMS == 1 && $AZB_MODE_LTS == 1 ]]; then
fi fi
if [[ $AZB_UPDATE_PKGBUILDS == 1 && $AZB_MODE_GIT == 1 ]]; then if [[ $AZB_UPDATE_PKGBUILDS == 1 && $AZB_MODE_GIT == 1 ]]; then
debug "Updating git pkgbuilds"
update_git_pkgbuilds update_git_pkgbuilds
elif [[ $AZB_UPDATE_PKGBUILDS == 1 && $AZB_MODE_LTS == 1 ]]; then elif [[ $AZB_UPDATE_PKGBUILDS == 1 && $AZB_MODE_LTS == 1 ]]; then
debug "Updating lts pkgbuilds"
update_lts_pkgbuilds update_lts_pkgbuilds
fi fi

@ -119,13 +119,17 @@ package_version_from_syncdb() {
full_kernel_git_version() { full_kernel_git_version() {
# Determine if the kernel version has the format 3.14 or 3.14.1 # Determine if the kernel version has the format 3.14 or 3.14.1
[[ ${AZB_GIT_KERNEL_VERSION} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:digit:]]+) ]] if [[ ${AZB_GIT_KERNEL_VERSION} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:digit:]]+) ]]; then
debug "full_kernel_git_version: Have kernel with minor version!"
fi
debug "full_kernel_git_version: BASH_REMATCH[1] == '${BASH_REMATCH[1]}'"
if [[ ${BASH_REMATCH[1]} != "" ]]; then if [[ ${BASH_REMATCH[1]} != "" ]]; then
AZB_GIT_KERNEL_X32_VERSION_FULL=${AZB_GIT_KERNEL_X32_VERSION} AZB_GIT_KERNEL_X32_VERSION_FULL=${AZB_GIT_KERNEL_X32_VERSION}
AZB_GIT_KERNEL_X64_VERSION_FULL=${AZB_GIT_KERNEL_X64_VERSION} AZB_GIT_KERNEL_X64_VERSION_FULL=${AZB_GIT_KERNEL_X64_VERSION}
AZB_GIT_KERNEL_X32_VERSION_CLEAN=$(echo ${AZB_GIT_KERNEL_X32_VERSION} | sed s/-/_/g) AZB_GIT_KERNEL_X32_VERSION_CLEAN=$(echo ${AZB_GIT_KERNEL_X32_VERSION} | sed s/-/_/g)
AZB_GIT_KERNEL_X64_VERSION_CLEAN=$(echo ${AZB_GIT_KERNEL_X64_VERSION} | sed s/-/_/g) AZB_GIT_KERNEL_X64_VERSION_CLEAN=$(echo ${AZB_GIT_KERNEL_X64_VERSION} | sed s/-/_/g)
else else
debug "full_kernel_git_version: Have kernel without minor version!'"
# Kernel version has the format 3.14, so add a 0. # Kernel version has the format 3.14, so add a 0.
AZB_GIT_KERNEL_X32_VERSION_FULL=${AZB_GIT_KERNEL_VERSION}.0-${AZB_GIT_KERNEL_X32_PKGREL} AZB_GIT_KERNEL_X32_VERSION_FULL=${AZB_GIT_KERNEL_VERSION}.0-${AZB_GIT_KERNEL_X32_PKGREL}
AZB_GIT_KERNEL_X64_VERSION_FULL=${AZB_GIT_KERNEL_VERSION}.0-${AZB_GIT_KERNEL_X64_PKGREL} AZB_GIT_KERNEL_X64_VERSION_FULL=${AZB_GIT_KERNEL_VERSION}.0-${AZB_GIT_KERNEL_X64_PKGREL}

Loading…
Cancel
Save