++__cdist_exit_err
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								49e8efdaf5
							
						
					
				
			
			
				commit
				
					
						c0a83f9d85
					
				
			
		
					 2 changed files with 3 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -52,7 +52,7 @@ if [ ! -f "$__cdist_object_finished" ]; then
 | 
			
		|||
 | 
			
		||||
      while [ $# -gt 0 ]; do
 | 
			
		||||
         __cdist_requirement="$1"; shift
 | 
			
		||||
         echo "Resolving dependency $__cdist_requirement"
 | 
			
		||||
         __cdist_echo info "Resolving dependency $__cdist_requirement"
 | 
			
		||||
         cdist-object-run "$__cdist_target_host" "$__cdist_requirement"
 | 
			
		||||
      done
 | 
			
		||||
   fi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -55,16 +55,14 @@ for explorer in "$__cdist_explorer_dir/"*; do
 | 
			
		|||
 | 
			
		||||
   if [ -f "$explorer" ]; then
 | 
			
		||||
      if [ ! -x "$explorer" ]; then
 | 
			
		||||
         echo "Explorer \"$explorer\" exists, but is not executable." >&2
 | 
			
		||||
         exit 1
 | 
			
		||||
         __cdist_exit_err "Explorer \"$explorer\" exists, but is not executable."
 | 
			
		||||
      fi
 | 
			
		||||
 | 
			
		||||
      # Execute explorers and save results in remote destination directory
 | 
			
		||||
      "$explorer" > "${__cdist_my_out_dir}/$explorer_name"
 | 
			
		||||
   else
 | 
			
		||||
      if [ -e "$explorer" ]; then
 | 
			
		||||
         echo "Explorer \"$explorer\" exists, but is not a file." >&2
 | 
			
		||||
         exit 1
 | 
			
		||||
         __cdist_exit_err "Explorer \"$explorer\" exists, but is not a file."
 | 
			
		||||
      fi
 | 
			
		||||
   fi
 | 
			
		||||
done
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue