move __cdist_object_list into seperate file
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								bea7d5f828
							
						
					
				
			
			
				commit
				
					
						f7f2194b8f
					
				
			
		
					 2 changed files with 36 additions and 14 deletions
				
			
		| 
						 | 
					@ -219,20 +219,6 @@ __cdist_object_id_from_object()
 | 
				
			||||||
   echo "${1#*/}"
 | 
					   echo "${1#*/}"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Find objects, remove ./ and /MARKER
 | 
					 | 
				
			||||||
__cdist_object_list()
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
   local basedir="$1"; shift
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
   # Use subshell to prevent changing cwd in program
 | 
					 | 
				
			||||||
   (
 | 
					 | 
				
			||||||
      cd "${basedir}"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      find . -name "$__cdist_name_dot_cdist" |    \
 | 
					 | 
				
			||||||
         sed -e 's;^./;;' -e "s;/${__cdist_name_dot_cdist}\$;;"
 | 
					 | 
				
			||||||
   )
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
__cdist_object_parameter_dir()
 | 
					__cdist_object_parameter_dir()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
   echo "$(__cdist_object_dir "$1")/${__cdist_name_parameter}"
 | 
					   echo "$(__cdist_object_dir "$1")/${__cdist_name_parameter}"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										36
									
								
								core/__cdist_object_list
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										36
									
								
								core/__cdist_object_list
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
					@ -0,0 +1,36 @@
 | 
				
			||||||
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 2011 Nico Schottelius (nico-cdist at schottelius.org)
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# This file is part of cdist.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# cdist is free software: you can redistribute it and/or modify
 | 
				
			||||||
 | 
					# it under the terms of the GNU General Public License as published by
 | 
				
			||||||
 | 
					# the Free Software Foundation, either version 3 of the License, or
 | 
				
			||||||
 | 
					# (at your option) any later version.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# cdist is distributed in the hope that it will be useful,
 | 
				
			||||||
 | 
					# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
				
			||||||
 | 
					# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
				
			||||||
 | 
					# GNU General Public License for more details.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# You should have received a copy of the GNU General Public License
 | 
				
			||||||
 | 
					# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# Print error and exit (perror() alike)
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					__cdist_object_list()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					   # FIXME: no local in posix
 | 
				
			||||||
 | 
					   local basedir="$1"; shift
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   # Use subshell to prevent changing cwd in program
 | 
				
			||||||
 | 
					   (   
 | 
				
			||||||
 | 
					      cd "${basedir}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      find . -name "$__cdist_name_dot_cdist" |    \   
 | 
				
			||||||
 | 
					         sed -e 's;^./;;' -e "s;/${__cdist_name_dot_cdist}\$;;"
 | 
				
			||||||
 | 
					   )   
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue