In ubuntu, rpm can be installed, if rpm is installed,ubuntu will use rpm instead of dpkg,so check dpkg first
This commit is contained in:
parent
b76e15c487
commit
97df5ec9a6
@ -396,31 +396,36 @@ hasdpkg=0
|
||||
supdatecommand="rpm -Uvh --replacepkgs"
|
||||
sremovecommand="rpm -ev"
|
||||
|
||||
result=`rpm --version 2>/dev/null`
|
||||
#In ubuntu, rpm can be installed, if rpm is installed,ubuntu will use rpm
|
||||
#So dpkg --version should be in front of rpm --version
|
||||
result=`dpkg --version 2>/dev/null`
|
||||
if [ $? -eq 0 ]; then
|
||||
hasrpm=1
|
||||
result=`rpm -q yum`
|
||||
if [ $? -eq 0 ]; then
|
||||
hasyum=1
|
||||
else
|
||||
result=`rpm -q zypper`
|
||||
if [ "$?" = "0" ]; then
|
||||
haszypper=1
|
||||
fi
|
||||
fi
|
||||
else
|
||||
result=`dpkg --version`
|
||||
hasdpkg=1
|
||||
supdatecommand="dpkg -i"
|
||||
sremovecommand="dpkg -r"
|
||||
result=`dpkg -l apt`
|
||||
if [ $? -eq 0 ]; then
|
||||
hasdpkg=1
|
||||
supdatecommand="dpkg -i"
|
||||
sremovecommand="dpkg -r"
|
||||
result=`dpkg -l apt`
|
||||
if [ $? -eq 0 ]; then
|
||||
hasapt=1
|
||||
fi
|
||||
hasapt=1
|
||||
fi
|
||||
else
|
||||
result=`rpm --version 2>/dev/null`
|
||||
if [ $? -eq 0 ]; then
|
||||
hasrpm=1
|
||||
result=`rpm -q yum`
|
||||
if [ $? -eq 0 ]; then
|
||||
hasyum=1
|
||||
else
|
||||
result=`rpm -q zypper`
|
||||
if [ "$?" = "0" ]; then
|
||||
haszypper=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
###########
|
||||
##start generating the os pkg repositories
|
||||
if ( pmatch "$OSVER" "sles11*" && [ $haszypper -eq 1 ] ); then
|
||||
|
Loading…
x
Reference in New Issue
Block a user