diff options
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/fileutil.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/helper/fileutil.inc b/helper/fileutil.inc index 798f825a..abab7903 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -37,9 +37,9 @@ list_packet_files() { local OPTIONAL="$(echo "$PACKAGE" | cut -c 1)" [ "x$OPTIONAL" = "x@" ] && PACKAGE="$(echo "$PACKAGE" | cut -c 2-)" local FILES="" - if [ "$PACKET_MANAGER" = "apt" ]; then + if [ "$PACKET_HANDLER" = "dpkg" ]; then FILES="$(dpkg -L "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" - elif [ "$PACKET_MANAGER" = "zypper" -o "$PACKET_MANAGER" = "yum" ]; then + elif [ "$PACKET_HANDLER" = "rpm" ]; then FILES="$(rpm -ql "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" fi # ugly hack to get our return value @@ -70,7 +70,7 @@ install_dependencies() { } # # install given packet through system's packet manager -# uses PACKET_MANAGER as determined in helper/system.inc +# uses PACKET_HANDLER as determined in helper/system.inc # install_packages() { [ $# -eq 0 ] && perror "Sanity check failed: no argument given to install_package" @@ -79,14 +79,12 @@ install_packages() { for PKG in ${PACKAGE_LIST}; do # check if installed - if [ "x$PACKET_MANAGER" == "xapt" ]; then + if [ "x$PACKET_HANDLER" == "xdpkg" ]; then dpkg -L ${PKG} > /dev/null 2>&1 - elif [ "x$PACKET_MANAGER" == "xzypper" ]; then - rpm -ql ${PKG} > /dev/null 2>&1 - elif [ "x$PACKET_MANAGER" == "xyum" ]; then + elif [ "x$PACKET_HANDLER" == "xrpm" ]; then rpm -ql ${PKG} > /dev/null 2>&1 else - perror "No packet manager determined, this should not happen!" + perror "No packet manager / handler determined, this should not happen!" fi local LRET=$? |