isAPT: Also check for dpkg and rename it to isDeb
That way we should not try to use Debian/Ubuntu package names if apt4rpm is available.
This commit is contained in:
@@ -227,7 +227,7 @@ installCentOS4Package () { installRPMPackage "$@" }
|
||||
#
|
||||
# Functions to test if we're on a redhatesk or debianesk system
|
||||
#
|
||||
isAPT() ( [ -x $1/usr/bin/apt-get ] )
|
||||
isDeb() ( [ -x $1/usr/bin/apt-get -a -x $1/usr/bin/dpkg ] )
|
||||
isYum() ( [ -x $1/usr/bin/yum ] )
|
||||
|
||||
|
||||
@@ -239,7 +239,7 @@ installPackage ()
|
||||
prefix=$1
|
||||
package=$2
|
||||
|
||||
if isAPT ; then
|
||||
if isDeb ; then
|
||||
installDebianPackage "$@"
|
||||
|
||||
elif isYum ; then
|
||||
|
||||
Reference in New Issue
Block a user