Don't force a .bat extension for scripts under Windows.
This commit is contained in:
		
							parent
							
								
									b180c1af99
								
							
						
					
					
						commit
						8f84244458
					
				
					 4 changed files with 2 additions and 18 deletions
				
			
		| 
						 | 
				
			
			@ -1346,7 +1346,7 @@ Setting this options also implicitly sets IndirectData.
 | 
			
		|||
@cindex scripts
 | 
			
		||||
Apart from reading the server and host configuration files,
 | 
			
		||||
tinc can also run scripts at certain moments.
 | 
			
		||||
Under Windows (not Cygwin), the scripts should have the extension .bat.
 | 
			
		||||
Under Windows (not Cygwin), the scripts should have the extension @file{.bat} or @file{.cmd}.
 | 
			
		||||
 | 
			
		||||
@table @file
 | 
			
		||||
@cindex tinc-up
 | 
			
		||||
| 
						 | 
				
			
			@ -1386,7 +1386,7 @@ This script is started when a Subnet becomes unreachable.
 | 
			
		|||
The scripts are started without command line arguments,
 | 
			
		||||
but can make use of certain environment variables.
 | 
			
		||||
Under UNIX like operating systems the names of environment variables must be preceded by a $ in scripts.
 | 
			
		||||
Under Windows, in @file{.bat} files, they have to be put between % signs.
 | 
			
		||||
Under Windows, in @file{.bat} or @file{.cmd} files, they have to be put between % signs.
 | 
			
		||||
 | 
			
		||||
@table @env
 | 
			
		||||
@cindex NETNAME
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,12 +32,6 @@
 | 
			
		|||
#include "utils.h"
 | 
			
		||||
#include "xalloc.h"
 | 
			
		||||
 | 
			
		||||
#ifdef HAVE_MINGW
 | 
			
		||||
#define SCRIPTEXTENSION ".bat"
 | 
			
		||||
#else
 | 
			
		||||
#define SCRIPTEXTENSION ""
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
int addressfamily = AF_UNSPEC;
 | 
			
		||||
 | 
			
		||||
char *get_my_hostname() {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -455,11 +455,7 @@ bool setup_myself_reloadable(void) {
 | 
			
		|||
 | 
			
		||||
	free(scriptextension);
 | 
			
		||||
	if(!get_config_string(lookup_config(config_tree, "ScriptsExtension"), &scriptextension))
 | 
			
		||||
#ifdef HAVE_MINGW
 | 
			
		||||
		scriptextension = xstrdup(".bat");
 | 
			
		||||
#else
 | 
			
		||||
		scriptextension = xstrdup("");
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	get_config_string(lookup_config(config_tree, "Proxy"), &proxy);
 | 
			
		||||
	if(proxy) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -39,12 +39,6 @@
 | 
			
		|||
#include "tincctl.h"
 | 
			
		||||
#include "top.h"
 | 
			
		||||
 | 
			
		||||
#ifdef HAVE_MINGW
 | 
			
		||||
#define SCRIPTEXTENSION ".bat"
 | 
			
		||||
#else
 | 
			
		||||
#define SCRIPTEXTENSION ""
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
static char **orig_argv;
 | 
			
		||||
static int orig_argc;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue