github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-14 10:37:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #254 from henri-hulski/issue_246

Browse source 
More specific detecting of Ubuntu OS. Closes #246.
This commit is contained in:
Serghey Rodin 2014-12-05 21:20:37 +02:00
commit f7a30a3306
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-list-sys-info
View file

@ -32,7 +32,7 @@ if [ -e '/etc/redhat-release' ]; then
fi
VERSION=$(cat /etc/redhat-release | tr ' ' '\n' |grep [0-9])
else
if [ -e '/etc/lsb-release' ] && [ -e '/etc/debian_version' ]; then
if [ "$(lsb_release -si)" == "Ubuntu" ] && [ -e '/etc/debian_version' ]; then
OS="Ubuntu"
VERSION=$(grep DISTRIB_RELEASE /etc/lsb-release| cut -f 2 -d '=')
else

2
install/vst-install-debian.sh
View file

@ -95,7 +95,7 @@ if [ "x$(id -u)" != 'x0' ]; then
fi
# Check supported version
if [ -e '/etc/redhat-release' ] || [ -e '/etc/lsb-release' ]; then
if [ -e '/etc/redhat-release' ] || [ "$(lsb_release -si)" == "Ubuntu" ]; then
echo 'Error: sorry, this installer works only on Debian 7'
exit 1
fi

2
install/vst-install.sh
View file

@ -42,7 +42,7 @@ if [ -e '/etc/redhat-release' ]; then
type="rhel"
fi
if [ -e '/etc/lsb-release' ] && [ -e '/etc/debian_version' ]; then
if [ "$(lsb_release -si)" == "Ubuntu" ] && [ -e '/etc/debian_version' ]; then
type="ubuntu"
fi