lib/specinfra/helper/detect_os/suse.rb in specinfra-2.67.6 vs lib/specinfra/helper/detect_os/suse.rb in specinfra-2.67.7
- old
+ new
@@ -1,15 +1,15 @@
class Specinfra::Helper::DetectOs::Suse < Specinfra::Helper::DetectOs
def detect
- if run_command('ls /etc/os-release').success? and run_command('ls /etc/SuSe-release').success?
+ if run_command('ls /etc/os-release').success? and run_command('zypper -V').success?
line = run_command('cat /etc/os-release').stdout
- if line =~ /NAME=\"OpenSUSE"/
+ if line =~ /ID=opensuse/
family = 'opensuse'
elsif line =~ /NAME=\"SLES"/
family = 'sles'
- elsif line =~ /openSUSE (\d+\.\d+|\d+)/
+ end
+ if line =~ /VERSION_ID=\"(\d+\.\d+|\d+)\"/
release = $1
- family = 'opensuse'
end
{ :family => family, :release => release }
end
end
end