From 85ac28c1ea960ae97df3941be893121b3210178c Mon Sep 17 00:00:00 2001 From: Jeff Hutchins Date: Fri, 11 May 2012 07:28:47 -0600 Subject: [PATCH] More concise shell grain Thanks to @SEJeff for the idea. --- salt/grains/extra.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/salt/grains/extra.py b/salt/grains/extra.py index f155d2f1a3..110756a20d 100644 --- a/salt/grains/extra.py +++ b/salt/grains/extra.py @@ -6,8 +6,4 @@ def shell(): ''' # Provides: # shell - ret = {'shell': '/bin/sh'} - if 'SHELL' in os.environ: - ret['shell'] = os.environ['SHELL'] - return ret - + return {'shell': os.environ.get('SHELL', '/bin/sh'}