Merge pull request #169 from arkaitzj/global_explorers
Make global explorers available to initial manifest
This commit is contained in:
		
				commit
				
					
						002537f5d1
					
				
			
		
					 3 changed files with 4 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -20,6 +20,6 @@
 | 
			
		|||
#
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
if command -v hostname; then
 | 
			
		||||
   hostname
 | 
			
		||||
if command -v hostname >/dev/null; then
 | 
			
		||||
   hostname -f
 | 
			
		||||
fi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -106,6 +106,7 @@ class Manifest(object):
 | 
			
		|||
        env.update(self.env)
 | 
			
		||||
        env['__cdist_manifest'] = initial_manifest
 | 
			
		||||
        env['__manifest'] = self.local.manifest_path
 | 
			
		||||
        env['__explorer'] = self.local.global_explorer_out_path
 | 
			
		||||
 | 
			
		||||
        return env
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -179,7 +179,7 @@ ENVIRONMENT VARIABLES
 | 
			
		|||
---------------------
 | 
			
		||||
__explorer::
 | 
			
		||||
    Directory that contains all global explorers.
 | 
			
		||||
    Available for: explorer, type explorer
 | 
			
		||||
    Available for: initial manifest, explorer, type explorer
 | 
			
		||||
__manifest::
 | 
			
		||||
    Directory that contains the initial manifest.
 | 
			
		||||
    Available for: initial manifest, type manifest
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue