diff options
| author | Simon Rettberg | 2014-01-17 18:01:53 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-17 18:01:53 +0100 |
| commit | 2dab5b88f40224742a07ceb92a955f5359d99e85 (patch) | |
| tree | fdaa44e5888cd72833e4ea9bf97780834df21b51 /remote/includes | |
| parent | [pam] nss-ldap -> nss-ldapd (diff) | |
| parent | [rootfs-stage32] openSuse: Added cdrom module (REQUIRED_KERNEL_MODULES+=) (diff) | |
| download | tm-scripts-2dab5b88f40224742a07ceb92a955f5359d99e85.tar.gz tm-scripts-2dab5b88f40224742a07ceb92a955f5359d99e85.tar.xz tm-scripts-2dab5b88f40224742a07ceb92a955f5359d99e85.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/includes')
| -rw-r--r-- | remote/includes/packagemanager.inc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/remote/includes/packagemanager.inc b/remote/includes/packagemanager.inc index 6f0d86dd..edd3949e 100644 --- a/remote/includes/packagemanager.inc +++ b/remote/includes/packagemanager.inc @@ -60,7 +60,9 @@ install_packages() { local INSTALLED_PACKAGES="" for PKG in ${PACKAGE_LIST}; do - # check if installed + # check if installed: + # this is done mainly for performance reasons, even though + # reinstalling all packages is a valid possibility too... if [ "x$PACKET_HANDLER" == "xdpkg" ]; then dpkg -l ${PKG} > /dev/null 2>&1 elif [ "x$PACKET_HANDLER" == "xrpm" ]; then @@ -71,15 +73,19 @@ install_packages() { local LRET=$? if [ "x$LRET" == "x0" ]; then - # check if it is completly installed, - # not just leftover configuration files - local INSTALL_STATUS=$(dpkg -l $PKG | grep $PKG | cut -c1-2) - if [[ $INSTALL_STATUS != "ii" ]]; then - pinfo "$PKG not installed!" + # check if it is completly installed, not just leftover configuration files + if [ "x$PACKET_HANDLER" == "xdpkg" ]; then + local INSTALL_STATUS=$(dpkg -l $PKG | grep $PKG | cut -c1-2) + if [[ $INSTALL_STATUS != "ii" ]]; then + pinfo "$PKG is either missing or a meta-package! Installing it to be sure..." + install_package $PKG + else + # package installed + pdebug "$PKG installed!" + fi + elif [ "x$PACKET_HANDLER" == "xrpm" ]; then + # TODO: blindly install again for now install_package $PKG - else - # package installed - pdebug "$PKG installed!" fi else # package not installed @@ -87,7 +93,7 @@ install_packages() { install_package $PKG fi done - [ ! -z "$INSTALLED_PACKAGES" ] && pinfo "Packages installed: ${INSTALLED_PACKAGES}" + [ ! -z "$INSTALLED_PACKAGES" ] && pinfo "New packages installed: ${INSTALLED_PACKAGES}" } # |