Merge branch 'issue/280' of git://github.com/asteven/cdist
This commit is contained in:
		
				commit
				
					
						4f47585cbc
					
				
			
		
					 2 changed files with 8 additions and 10 deletions
				
			
		|  | @ -1,6 +1,7 @@ | ||||||
| #!/bin/sh | #!/bin/sh | ||||||
| # | # | ||||||
| # 2011-2012 Nico Schottelius (nico-cdist at schottelius.org) | # 2011-2012 Nico Schottelius (nico-cdist at schottelius.org) | ||||||
|  | # 2014 Steven Armstrong (steven-cdist at armstrong.cc) | ||||||
| # | # | ||||||
| # This file is part of cdist. | # This file is part of cdist. | ||||||
| # | # | ||||||
|  | @ -17,7 +18,6 @@ | ||||||
| # You should have received a copy of the GNU General Public License | # You should have received a copy of the GNU General Public License | ||||||
| # along with cdist. If not, see <http://www.gnu.org/licenses/>. | # along with cdist. If not, see <http://www.gnu.org/licenses/>. | ||||||
| # | # | ||||||
| # |  | ||||||
| 
 | 
 | ||||||
| if [ -f "$__object/parameter/name" ]; then | if [ -f "$__object/parameter/name" ]; then | ||||||
|     name="$(cat "$__object/parameter/name")" |     name="$(cat "$__object/parameter/name")" | ||||||
|  | @ -25,21 +25,18 @@ else | ||||||
|     name="$__object_id" |     name="$__object_id" | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| parameter_state="$__object/parameter/state" | state_should="$(cat "$__object/parameter/state")" | ||||||
| if [ -f "$_parameter_state" ]; then |  | ||||||
|     state_should=$(cat "$__object/parameter/state") |  | ||||||
| else |  | ||||||
|     state_should="present" |  | ||||||
| fi |  | ||||||
| 
 | 
 | ||||||
| runs="$(cat "$__object/explorer/runs")" | if [ -s "$__object/explorer/runs" ]; then | ||||||
| if [ "$runs" ]; then |  | ||||||
|     state_is="present" |     state_is="present" | ||||||
| else | else | ||||||
|     state_is="absent" |     state_is="absent" | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| [ "$state_is" = "$state_should" ] && exit 0 | if [ "$state_is" = "$state_should" ]; then | ||||||
|  |    # nothing to do | ||||||
|  |    exit 0 | ||||||
|  | fi | ||||||
| 
 | 
 | ||||||
| case "$state_should" in | case "$state_should" in | ||||||
|     present) |     present) | ||||||
|  |  | ||||||
							
								
								
									
										1
									
								
								cdist/conf/type/__process/parameter/default/state
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cdist/conf/type/__process/parameter/default/state
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | ||||||
|  | present | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue