Browse Source

Fix issue #593

hotfix/v3.3.3
harshadyeola 10 years ago
parent
commit
9571fd7d6a
  1. 42
      install

42
install

@ -280,8 +280,11 @@ function ee_update_latest()
ee_lib_echo "Updating Nginx configuration, please wait..." ee_lib_echo "Updating Nginx configuration, please wait..."
# From version 3.1.10 we are using Suse builder for repository # From version 3.1.10 we are using Suse builder for repository
if [ "$ee_distro_version" == "precise" ]; then if [ "$ee_distro_version" == "precise" ]; then
if [ -f /etc/apt/sources.list.d/rtcamp-nginx-precise.list ]; then grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
rm -rf /etc/apt/sources.list.d/rtcamp-nginx-precise.list if [[ $? -ne 0 ]]; then
if [ -f /etc/apt/sources.list.d/rtcamp-nginx-precise.list ]; then
rm -rf /etc/apt/sources.list.d/rtcamp-nginx-precise.list
fi
echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /" >> /etc/apt/sources.list.d/ee-repo.list echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03' gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03'
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
@ -291,10 +294,14 @@ function ee_update_latest()
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
apt-get update apt-get update
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
elif [ "$ee_distro_version" == "trusty" ]; then elif [ "$ee_distro_version" == "trusty" ]; then
if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list if [[ $? -ne 0 ]]; then
if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then
rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list
fi
echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /" >> /etc/apt/sources.list.d/ee-repo.list echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03' gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03'
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
@ -303,16 +310,17 @@ function ee_update_latest()
fi fi
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
apt-get update apt-get update
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
elif [ "$ee_distro_version" == "wheezy" ]; then elif [ "$ee_distro_version" == "wheezy" ]; then
grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
if [ $? -eq 0 ] || [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then #grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then if [ $? -ne 0 ] || [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then
rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list # if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then
else # rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list
sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null # else
fi # sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
# fi
echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /etc/apt/sources.list.d/ee-repo.list echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03' gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03'
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
@ -325,11 +333,13 @@ function ee_update_latest()
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
elif [ "$ee_distro_version" == "jessie" ]; then elif [ "$ee_distro_version" == "jessie" ]; then
grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
if [[ $? -eq 0 ]]; then grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
sed -i "/deb http:\/\/packages.dotdeb.org jessie all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null #grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
if [[ $? -ne 0 ]]; then
#sed -i "/deb http:\/\/packages.dotdeb.org jessie all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /" >> /etc/apt/sources.list.d/ee-repo.list echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03' gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null

Loading…
Cancel
Save