Merge pull request #465 from inspec/zenspider/cleanup

Minor cleanup of logic in OSCommon#unix_uuid.
inspec · May 31, 2019 · 44e9ec6 · 44e9ec6
2 parents 2b8423b + 5fd60ec
commit 44e9ec6
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/train/platforms/detect/helpers/os_common.rb b/lib/train/platforms/detect/helpers/os_common.rb
@@ -88,11 +88,10 @@ def cisco_show_version
     end
 
     def unix_uuid
-      uuid = unix_uuid_from_chef
-      uuid = unix_uuid_from_machine_file if uuid.nil?
-      uuid = uuid_from_command if uuid.nil?
-      raise Train::TransportError, 'Cannot find a UUID for your node.' if uuid.nil?
-      uuid
+      (unix_uuid_from_chef         ||
+       unix_uuid_from_machine_file ||
+       uuid_from_command           ||
+       raise(Train::TransportError, 'Cannot find a UUID for your node.'))
     end
 
     def unix_uuid_from_chef