Merge branch 'release/1.3.8' into main

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 All notable changes to the "gitflow" extension will be documented in this file.
 
-## [unreleased] 05/18/2022
+## [1.3.6] 05/18/2022
 
+- fix - tmp dir for message files on release and hotfix
 - add - parameter `gitflow.path` to manually set gitflow executable.
 - fix - Changelog automatic update month is 1 less.
 

README.md

@@ -163,7 +163,8 @@ GitHub CLI will automatically store your Git credentials for you when you choose
 
 ## Changelog
 
-- 1.3.5
+- 1.3.6
+  - fix - tmp dir for message files on release and hotfix
   - add - parameter `gitflow.path` to manually set gitflow executable.
   - fix - Month updated in changelog one month less.
   - fix - Some words in command message `-m"Something"` caused command failed. Fixed by using file.

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-gitflow",
     "displayName": "Git Flow",
     "description": "Git-Flow support for VS Code",
-    "version": "1.3.5",
+    "version": "1.3.8",
     "engines": {
         "vscode": "^1.64.0"
     },
@@ -730,16 +730,16 @@
             ]
         }
     },
-    "_main": "./out/main.js",
-    "main": "./out/extension.js",
+    "main": "./out/main.js",
+    "_main": "./out/extension.js",
     "scripts": {
-        "_vscode:prepublish": "npm run esbuild-base -- --minify",
+        "vscode:prepublish": "npm run esbuild-base -- --minify",
         "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
         "esbuild": "npm run esbuild-base -- --sourcemap",
         "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
         "watch": "tsc -watch -p ./",
         "publish": "vsce package && gh release create $(node -pe \"require('./package.json')['version']\") --generate-notes \"./vscode-gitflow-$(node -pe \"require('./package.json')['version']\").vsix\" && vsce publish",
-        "vscode:prepublish": "npm run compile",
+        "_vscode:prepublish": "npm run compile",
         "compile": "tsc -p ./",
         "pretest": "npm run compile && npm run lint",
         "lint": "eslint src --ext ts",

src/ViewBranches.ts

@@ -3,6 +3,7 @@ import * as vscode from "vscode";
 import { Util } from "./lib/Util";
 import { readFileSync, writeFileSync, existsSync } from "fs";
 import path from "path";
+import os from "os";
 import { Tag } from './ViewVersions';
 
 interface BranchList {
@@ -435,7 +436,7 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
                         msg = `Finish ${ucf(feature)}: ${name}`;
                     }
 
-                    let tmpMsgFile = path.join(`${process.env.TMPDIR}`, `vscode-git-flow-${Math.floor(Math.random() * 10000000)}.msg`);
+                    let tmpMsgFile = path.join(`${os.tmpdir()}`, `vscode-git-flow-${Math.floor(Math.random() * 10000000)}.msg`);
                     writeFileSync(tmpMsgFile, msg, "utf-8");
                     option = `${option} -f ${tmpMsgFile} -T "${name}"`;
 
@@ -470,7 +471,7 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
                 ? " --showcommands "
                 : " ";
         let cmd = `${this.util.flowPath} ${feature} ${what}${command}${option} ${name} ${base}`;
-        //console.log(cmd);
+        console.log(cmd);
 
         this.util.exec(cmd, progress, (s) => {
             this._onDidChangeTreeData.fire();