beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changes to Debian Detection

Browse source
This commit is contained in:
earnolmartin 2019-07-24 12:00:00 -06:00
parent 18eb651a14
commit cb88bade9d
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ehcp/ehcpforceupdate.sh
View file

@ -711,7 +711,8 @@ function finalize(){
# Get distro name , by Marcel <marcelbutucea@gmail.com>, thanks to marcel for fixing whole code syntax
# No longer works in Ubuntu 13.04
# Fixed by Eric Martin <earnolmartin@gmail.com>
function checkDistro() {
function checkDistro() {
# Get distro properly
# Get distro properly
if [ -e /etc/issue ]; then
distro=$( cat /etc/issue | awk '{ print $1 }' )
@ -735,7 +736,8 @@ function checkDistro() {
else
# Convert it to lowercase
distro=$( echo $distro | awk '{print tolower($0)}' )
fi
fi
# Get actual release version information
version=$( lsb_release -r | awk '{ print $2 }' )
@ -762,11 +764,31 @@ function checkDistro() {
# Another way to get the version number
# version=$(lsb_release -r | awk '{ print $2 }')
echo "Your distro is $distro runnning version $version."
echo "Your distro is $distro runnning version $version"
if [ "$distro" != "debian" ]; then
echo "Your distros yearly release is $yrelease. Your distros monthly release is $mrelease."
fi
# Get distro and version initially installed on
if [ -e "/var/www/new/ehcp/distro_during_install.txt" ]; then
oldDistro=$(cat "/var/www/new/ehcp/distro_during_install.txt")
fi
if [ -e "/var/www/new/ehcp/version_during_install.txt" ]; then
oldYRelease=$(cat "/var/www/new/ehcp/version_during_install.txt" | awk {'print $1'})
oldMRelease=$(cat "/var/www/new/ehcp/version_during_install.txt" | awk {'print $2'})
fi
if [ ! -z "$oldYRelease" ] && [ ! -z "$oldMRelease" ] && [ ! -z "$oldDistro" ]; then
if [ "$oldYRelease" != "$yrelease" ] || [ "$oldMRelease" != "$mrelease" ] || [ "$oldDistro" != "$distro" ]; then
OSUpgradeChangeDetectedFromInstall=true
else
OSUpgradeChangeDetectedFromInstall=false
fi
else
OSUpgradeChangeDetectedFromInstall=true
fi
if [ "$distro" == "debian" ] && [ "$yrelease" -lt "8" ]; then
echo "Debian 7.x and lower are no longer supported."
exit