diff options
Diffstat (limited to 'redhat/build/install_rpm_package.sh')
| -rwxr-xr-x | redhat/build/install_rpm_package.sh | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh index dfaf46e17..93e2b5036 100755 --- a/redhat/build/install_rpm_package.sh +++ b/redhat/build/install_rpm_package.sh @@ -6,8 +6,7 @@ while [ -e "${LOCKFILE}" ]; do sleep 3 done -PKGCATEGORY="${1%%/*}" -PKGNAME="${1##*/}" +PKGNAME="${1}" if [ -x /usr/sbin/urpmi ]; then PKGINST='sudo urpmi --auto --no-verify-rpm' @@ -19,33 +18,8 @@ elif [ -x /usr/bin/apt-get ]; then PKGINST='sudo apt-get install -y' fi -# Language package: install only French language package -case "${PKGNAME}" in - "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";; - "koffice") PKGNAME="${PKGNAME}-suite";; -esac - -# Use the Trinity Prefix, or not. -case "${PKGNAME}" in - "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";; - "gnuchess"|"imlib1"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; - "curl") PREFIX="trinity-lib";; - *) PREFIX="trinity-";; -esac +# Gets RPM package name and development package (if any) +RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME} devel)" # Installing main package -eval ${PKGINST} "${PREFIX}${PKGNAME}" || exit 1 - -# Installing development package - -# Applications do NOT have development packages -case "${PKGCATEGORY}" in - "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;; -esac -# Other packags NOT having development package -case "${PKGNAME}" in - "hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;; - "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl") exit 0;; -esac - -eval ${PKGINST} "${PREFIX}${PKGNAME}-devel" +eval ${PKGINST} ${RPM_PKGNAME} || exit 1 |