atk_toolbox 0.0.94 → 0.0.95
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/atk/os.rb +7 -9
- data/lib/atk_toolbox/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5ecda2722237b6b479ebc318b65b42dab56d873a0181aca087fd1b932f8cbc59
|
|
4
|
+
data.tar.gz: 902649aca8f14e1d167d1ee86ce87b5be0814d40b84242ea2fcbdcf19b76da13
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 274010fed82a755e6c0b73f7162de2ea2056875cd3e8265dec7928e76229bb88cf0b1ab688d370e4b71ed9049802a80f589f3bc06719a4549fc3e23127cbf815
|
|
7
|
+
data.tar.gz: 357bad631187f49ab35d7fbdc1adb1792667e7e5c236c218a911365504475586f960b9aa4dee7830719542ab579f9675b5e575cb94ea467395ce0d43698b877c
|
data/lib/atk/os.rb
CHANGED
|
@@ -73,22 +73,20 @@ module OS
|
|
|
73
73
|
when 'debian'
|
|
74
74
|
return File.file?('/etc/debian_version')
|
|
75
75
|
when 'ubuntu'
|
|
76
|
-
return OS.has_command('lsb_release') && `lsb_release -a`.match(/Distributor ID:
|
|
76
|
+
return OS.has_command('lsb_release') && `lsb_release -a`.match(/Distributor ID:[\s\t]*Ubuntu/)
|
|
77
77
|
end
|
|
78
78
|
end
|
|
79
79
|
|
|
80
80
|
def self.version
|
|
81
81
|
# these statements need to be done in order from least to greatest
|
|
82
82
|
if OS.is?("ubuntu")
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
version.codename = name_area[1].strip
|
|
89
|
-
end
|
|
90
|
-
return version
|
|
83
|
+
version_info = `lsb_release -a`
|
|
84
|
+
version = Version.extract_from(version_info)
|
|
85
|
+
name_area = version_info.match(/Codename: *(.+)/)
|
|
86
|
+
if name_area
|
|
87
|
+
version.codename = name_area[1].strip
|
|
91
88
|
end
|
|
89
|
+
return version
|
|
92
90
|
elsif OS.is?("debian")
|
|
93
91
|
# TODO: support debian version
|
|
94
92
|
return nil
|
data/lib/atk_toolbox/version.rb
CHANGED