mturk 2004/03/13 02:38:32
Modified: jk/native2/server/isapi install4iis.js
Log:
Fix the install script argument parsing
Revision Changes Path
1.2 +5 -4 jakarta-tomcat-connectors/jk/native2/server/isapi/install4iis.js
Index: install4iis.js
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/install4iis.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- install4iis.js 29 Feb 2004 13:10:45 -0000 1.1
+++ install4iis.js 13 Mar 2004 10:38:32 -0000 1.2
@@ -437,8 +437,8 @@
}
}
-
- if (args.optind <= args.argc) {
+ TRACE("argc " + args.argc + " optind " + args.optind);
+ if (args.optind >= args.argc) {
/* Case when isapi_redirector2.dll is inside TOMCAT_HOME\bin */
params.WebPath = WScript.ScriptFullName.substr(0,
WScript.ScriptFullName.lastIndexOf("\\"));
@@ -446,14 +446,15 @@
}
else {
params.WebPath = args.argv(args.optind);
+ ++args.optind;
}
if (!checkFilterExists(params)) {
ERROR(args, "The specified filter library could not be found...\n" +
"File " + params.WebPath + "\\" + params.FilterLib + " does not
exist.");
}
- if (args.argc && (args.optind > (args.argc - 1)))
- tchome = args.argv(args.argc + 1);
+ if (args.optind < args.argc)
+ tchome = args.argv(args.optind);
else if (!tchome)
tchome = params.WebPath;
workers2 = tchome + _DEFAULT_WORKERS2 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
