diff options
Diffstat (limited to 'redhat/build')
-rwxr-xr-x | redhat/build/get_latest_built_package_version.sh | 4 | ||||
-rwxr-xr-x | redhat/build/install_rpm_package.sh | 2 | ||||
-rwxr-xr-x | redhat/build/is_latest_package_built.sh | 2 | ||||
-rwxr-xr-x | redhat/build/is_latest_package_installed.sh | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index ecd45b197..869efc93b 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -13,11 +13,11 @@ pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")" pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")" # Application packages: version does not match TDE version -if [[ "${pkg_release}" =~ _0_ ]]; then +if [[ "${pkg_release}" =~ _0_ ]] || [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then eval VERSION="${pkg_release/_0_/\~}" else # Base package (tdelibs ...) - eval VERSION="${pkg_version}${pkg_release/0_/\~}" + eval VERSION="${pkg_version}_${pkg_release/0_/\~}" fi VERSION="${VERSION%.opt}" # Remove '.opt' suffix diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh index 5deece1bd..156d02aec 100755 --- a/redhat/build/install_rpm_package.sh +++ b/redhat/build/install_rpm_package.sh @@ -11,7 +11,7 @@ PKGNAME="${1}" if [ -x /usr/sbin/urpmi ]; then PKGINST='sudo urpmi --auto --no-verify-rpm' elif [ -x /usr/bin/dnf ]; then - PKGINST="sudo dnf install -y --refresh --nogpgcheck" + PKGINST="sudo dnf install -y --nogpgcheck" elif [ -x /usr/bin/zypper ]; then PKGINST="sudo zypper install -y" elif [ -x /usr/bin/yum ]; then diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index a373ba021..2acb98a6a 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -17,7 +17,7 @@ if [ "${BUILT/~/}" != "${BUILT}" ]; then fi # Nominal case: no "~" caracter else - if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then + if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ ${TARBALL}_[0-9]* ]]; then echo "Latest stable package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh index 3bd6e2662..811cbafa0 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -20,7 +20,7 @@ else echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed." exit 0 fi - + # Other package (e.g. QT3) if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed." |