Просмотр исходного кода

Faster and more accurate function to get service information

Serghey Rodin 11 лет назад
Родитель
Сommit
1ef0360638
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      bin/v-list-sys-info
  2. 1 1
      install/vst-install-debian.sh
  3. 1 1
      install/vst-install.sh

+ 1 - 1
bin/v-list-sys-info

@@ -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

+ 1 - 1
install/vst-install-debian.sh

@@ -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

+ 1 - 1
install/vst-install.sh

@@ -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