forked from ungleich-public/cdist
		
	Merge remote-tracking branch 'steven/issue/200'
This commit is contained in:
		
				commit
				
					
						ee519b878d
					
				
			
		
					 2 changed files with 6 additions and 12 deletions
				
			
		
							
								
								
									
										9
									
								
								cdist/test/fixtures/remote/copy
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								cdist/test/fixtures/remote/copy
									
										
									
									
										vendored
									
									
								
							|  | @ -1,6 +1,7 @@ | ||||||
| #!/bin/sh | #!/bin/sh | ||||||
| # | # | ||||||
| # 2012-2013 Nico Schottelius (nico-cdist schottelius.org) | # 2012-2013 Nico Schottelius (nico-cdist schottelius.org) | ||||||
|  | # 2013 Steven Armstrong (steven-cdist armstrong.cc) | ||||||
| # | # | ||||||
| # This file is part of cdist. | # This file is part of cdist. | ||||||
| # | # | ||||||
|  | @ -22,9 +23,5 @@ | ||||||
| # test cases | # test cases | ||||||
| # | # | ||||||
| 
 | 
 | ||||||
| recursive=$1; shift | code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")" | ||||||
| src=$1; shift | cp --dereference $code | ||||||
| dst=$1; shift |  | ||||||
| 
 |  | ||||||
| dst=$(echo $dst | sed "s/^${__target_host}://") |  | ||||||
| cp --dereference "$recursive" "$src" "$dst" |  | ||||||
|  |  | ||||||
|  | @ -1,6 +1,7 @@ | ||||||
| #!/bin/sh | #!/bin/sh | ||||||
| # | # | ||||||
| # 2012 Nico Schottelius (nico-cdist schottelius.org) | # 2012 Nico Schottelius (nico-cdist schottelius.org) | ||||||
|  | # 2013 Steven Armstrong (steven-cdist armstrong.cc) | ||||||
| # | # | ||||||
| # This file is part of cdist. | # This file is part of cdist. | ||||||
| # | # | ||||||
|  | @ -19,9 +20,5 @@ | ||||||
| # | # | ||||||
| # | # | ||||||
| 
 | 
 | ||||||
| recursive=$1; shift | code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")" | ||||||
| src=$1; shift | cp --dereference $code | ||||||
| dst=$1; shift |  | ||||||
| 
 |  | ||||||
| dst=$(echo $dst | sed "s/^${__target_host}://") |  | ||||||
| cp "$recursive" "$src" "$dst" |  | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue