Revert "Merge pull request #610 from es1o/master"

This reverts commit ed2c162, reversing
changes made to af6aa37.

Distributions other than suse also has /etc/os-release.
So pr610 breaks os detection mechanism.

lib/specinfra/helper/detect_os/suse.rb

@@ -1,14 +1,13 @@
 class Specinfra::Helper::DetectOs::Suse < Specinfra::Helper::DetectOs
   def detect
-    if run_command('ls /etc/os-release').success?
-      line = run_command('cat /etc/os-release').stdout
-      if line =~ /NAME=\"OpenSUSE"/
-        family = 'opensuse'
-      elsif line =~ /NAME=\"SLES"/
+    if run_command('ls /etc/SuSE-release').success?
+      line = run_command('cat /etc/SuSE-release').stdout
+      if line =~ /SUSE Linux Enterprise Server (\d+)/
+        release = $1
         family = 'sles'
-      end
-      if line =~ /VERSION_ID=\"(\d+\.\d+|\d+)\"/
+      elsif line =~ /openSUSE (\d+\.\d+|\d+)/
         release = $1
+        family = 'opensuse'
       end
       { :family => family, :release => release }
     end

spec/helper/detect_os/suse_spec.rb

@@ -3,18 +3,9 @@
 
 describe Specinfra::Helper::DetectOs::Suse do
   suse = Specinfra::Helper::DetectOs::Suse.new(:exec)
-  it 'Should return opensuse 42 when openSUSE 42.2 is installed.' do
+  it 'Should return opensuse 13 when openSUSE 13.2 is installed.' do
     allow(suse).to receive(:run_command) {
-        CommandResult.new(:stdout => 'NAME=\"openSUSE Leap\"\nVERSION=\"42.2\"\nID=opensuse\nID_LIKE=\"suse\"\nVERSION_ID=\"42.2\"\nPRETTY_NAME=\"openSUSE Leap 42.2\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:opensuse:leap:42.2\"\nBUG_REPORT_URL=\"https://bugs.opensuse.org\"\nHOME_URL=\"https://www.opensuse.org/\"\n', :exit_status => 0)
-    }
-    expect(suse.detect).to include(
-      :family  => 'opensuse',
-      :release => '42.2'
-    )
-  end
-  it 'Should return opensuse 13.2 when openSUSE 13.2 is installed.' do
-    allow(suse).to receive(:run_command) {
-        CommandResult.new(:stdout => 'NAME=openSUSE\nVERSION=\"13.2 (Harlequin)\"\nVERSION_ID=\"13.2\"\nPRETTY_NAME=\"openSUSE 13.2 (Harlequin) (x86_64)\"\nID=opensuse\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:opensuse:opensuse:13.2\"\nBUG_REPORT_URL=\"https://bugs.opensuse.org\"\nHOME_URL=\"https://opensuse.org/\"\nID_LIKE=\"suse\"\n', :exit_status => 0)
+        CommandResult.new(:stdout => 'openSUSE 13.2 (x86_64)', :exit_status => 0)
     }
     expect(suse.detect).to include(
       :family  => 'opensuse',
@@ -23,7 +14,7 @@
   end
   it 'Should return sles 12 when SUSE Linux Enterprise Server 12 is installed.' do
     allow(suse).to receive(:run_command) {
-      CommandResult.new(:stdout => 'NAME=\"SLES\"\nVERSION=\"12\"\nVERSION_ID=\"12\"\nPRETTY_NAME=\"SUSE Linux Enterprise Server 12\"\nID=\"sles\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:suse:sles:12\"\n', :exit_status => 0)
+      CommandResult.new(:stdout => 'SUSE Linux Enterprise Server 12', :exit_status => 0)
     }
     expect(suse.detect).to include(
       :family  => 'sles',