Update temp dir and tools dir

lib/runner.js

@@ -6,9 +6,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     result["default"] = mod;
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const fs = __importStar(require("fs"));
+const md5_1 = __importDefault(require("md5"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const analyze_1 = require("./analyze");
@@ -40,14 +44,16 @@ function parseGithubUrl(inputUrl) {
     }
 }
 function getTempDir(userInput) {
-    const tempDir = path.join(userInput || os.tmpdir(), 'codeql-runner-temp');
+    const cwd = process.cwd();
+    const cwdHash = md5_1.default(cwd);
+    const tempDir = path.join(userInput || process.cwd(), 'codeql-runner', cwdHash);
     if (!fs.existsSync(tempDir)) {
         fs.mkdirSync(tempDir, { recursive: true });
     }
     return tempDir;
 }
-function getToolsDir(userInput, tmpDir) {
-    const toolsDir = path.join(userInput || path.dirname(tmpDir), 'codeql-runner-tools');
+function getToolsDir(userInput) {
+    const toolsDir = userInput || path.join(os.homedir(), 'codeql-runner-tools');
     if (!fs.existsSync(toolsDir)) {
         fs.mkdirSync(toolsDir, { recursive: true });
     }
@@ -64,13 +70,13 @@ program
     .option('--queries <queries>', 'Comma-separated list of additional queries to run. By default, this overrides the same setting in a configuration file.')
     .option('--config-file <file>', 'Path to config file')
     .option('--codeql-path <path>', 'Path to a copy of the CodeQL CLI executable to use. Otherwise downloads a copy.')
-    .option('--temp-dir <dir>', 'Directory to use for temporary files. Defaults to OS temp dir.')
-    .option('--tools-dir <dir>', 'Directory to use for CodeQL tools and other files to store between runs. Defaults to same as temp dir.')
+    .option('--temp-dir <dir>', 'Directory to use for temporary files. By default will use current working directory.')
+    .option('--tools-dir <dir>', 'Directory to use for CodeQL tools and other files to store between runs. By default will use home directory.')
     .option('--checkout-path <path>', 'Checkout path (default: current working directory)')
     .action(async (cmd) => {
     try {
         const tempDir = getTempDir(cmd.tempDir);
-        const toolsDir = getToolsDir(cmd.toolsDir, tempDir);
+        const toolsDir = getToolsDir(cmd.toolsDir);
         // Wipe the temp dir
         fs.rmdirSync(tempDir, { recursive: true });
         fs.mkdirSync(tempDir, { recursive: true });
@@ -124,7 +130,7 @@ program
     .command('autobuild')
     .description('Attempts to automatically build code')
     .requiredOption('--language <language>', 'The language to build')
-    .option('--temp-dir <dir>', 'Directory to use for temporary files. Defaults to OS temp dir.')
+    .option('--temp-dir <dir>', 'Directory to use for temporary files. By default will use current working directory.')
     .action(async (cmd) => {
     try {
         const language = languages_1.parseLanguage(cmd.language);
@@ -150,7 +156,7 @@ program
     .option('--checkout-path <path>', 'Checkout path (default: current working directory)')
     .option('--no-upload', 'Do not upload results after analysis', false)
     .option('--output-dir <dir>', 'Directory to output SARIF files to. By default will use temp directory.')
-    .option('--temp-dir <dir>', 'Directory to use for temporary files. Defaults to OS temp dir.')
+    .option('--temp-dir <dir>', 'Directory to use for temporary files. By default will use current working directory.')
     .action(async (cmd) => {
     try {
         const tempDir = getTempDir(cmd.tempDir);