Merge remote-tracking branch 'github/master'
This commit is contained in:
		
				commit
				
					
						ba3819a83e
					
				
			
		
					 1 changed files with 5 additions and 3 deletions
				
			
		|  | @ -1,6 +1,6 @@ | |||
| #!/bin/sh | ||||
| # | ||||
| # 2012 Steven Armstrong (steven-cdist at armstrong.cc) | ||||
| # 2012-2013 Steven Armstrong (steven-cdist at armstrong.cc) | ||||
| # | ||||
| # This file is part of cdist. | ||||
| # | ||||
|  | @ -47,7 +47,9 @@ remove_entry() { | |||
|    prefix="#cdist:$__object_name" | ||||
|    suffix="#/cdist:$__object_name" | ||||
|    cat << DONE | ||||
| tmpfile=\$(mktemp) | ||||
| tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX) | ||||
| # preserve ownership and permissions by copying existing file over tmpfile | ||||
| cp -p "$file" "\$tmpfile" | ||||
| awk -v prefix="$prefix" -v suffix="$suffix" ' | ||||
| { | ||||
|    if (index(\$0,prefix)) { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue