Fixed bug of not copying files after detected version missmatch

Author: Simon Hofmann

Diff for: build/setupOpencv.js

@@ -34,6 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 var constants_1 = require("./constants");
 var dirs_1 = require("./dirs");
@@ -212,36 +213,49 @@ function installOpenCV() {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!fs_extra_1.existsSync(dirs_1.dirs.opencvInstallRoot)) return [3 /*break*/, 4];
+                    if (!fs_extra_1.existsSync(dirs_1.dirs.opencvInstallRoot)) return [3 /*break*/, 5];
                     log.info("Directory " + dirs_1.dirs.opencvInstallRoot + " already exists, assuming existing installation.");
-                    if (!(readVersionInfo() === null || readVersionInfo() !== getPackageVersion())) return [3 /*break*/, 2];
+                    if (!(readVersionInfo() === null || readVersionInfo() !== getPackageVersion())) return [3 /*break*/, 3];
                     log.info("Discovered version missmatch. Have: " + readVersionInfo() + " Want: " + getPackageVersion());
                     log.info("Removing previous installation.");
                     return [4 /*yield*/, utils_1.exec(getRmDirCmd(dirs_1.dirs.opencvInstallRoot))];
                 case 1:
                     _a.sent();
-                    return [3 /*break*/, 3];
+                    return [4 /*yield*/, copyOpenCV()];
                 case 2:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
                     log.info("Remove the existing directory to force a clean install.");
-                    _a.label = 3;
-                case 3: return [3 /*break*/, 6];
-                case 4:
-                    log.info("Installing to " + dirs_1.dirs.opencvInstallRoot, "");
-                    return [4 /*yield*/, fs_extra_1.copy(dirs_1.dirs.opencvRoot, dirs_1.dirs.opencvInstallRoot, {
-                            recursive: true,
-                            errorOnExist: true,
-                            overwrite: false
-                        })];
+                    _a.label = 4;
+                case 4: return [3 /*break*/, 7];
                 case 5:
+                    log.info("Installing to " + dirs_1.dirs.opencvInstallRoot, "");
+                    return [4 /*yield*/, copyOpenCV()];
+                case 6:
                     _a.sent();
-                    writeVersionInfo(getPackageVersion());
-                    _a.label = 6;
-                case 6: return [2 /*return*/];
+                    _a.label = 7;
+                case 7: return [2 /*return*/];
             }
         });
     });
 }
 exports.installOpenCV = installOpenCV;
+var copyOpenCV = function () { return __awaiter(_this, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, fs_extra_1.copy(dirs_1.dirs.opencvRoot, dirs_1.dirs.opencvInstallRoot, {
+                    recursive: true,
+                    errorOnExist: true,
+                    overwrite: false
+                })];
+            case 1:
+                _a.sent();
+                writeVersionInfo(getPackageVersion());
+                return [2 /*return*/];
+        }
+    });
+}); };
 var getVersionInfoPath = function () { return path_1.join(dirs_1.dirs.opencvInstallRoot, "versioninfo.json"); };
 function writeVersionInfo(version) {
     fs_1.writeFileSync(getVersionInfoPath(), JSON.stringify({ version: version }));

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nut-tree/opencv-build",
-  "version": "3.4.6-beta31",
+  "version": "3.4.6",
   "description": "A simple script to auto build recent OpenCV + contrib version via npm. Base on [justadudewhohacks/npm-opencv-build](https://github.com/justadudewhohacks/npm-opencv-build)",
   "main": "./build/index.js",
   "scripts": {

Diff for: src/setupOpencv.ts

@@ -135,20 +135,25 @@ export async function installOpenCV() {
             log.info(`Discovered version missmatch. Have: ${readVersionInfo()} Want: ${getPackageVersion()}`);
             log.info(`Removing previous installation.`);
             await exec(getRmDirCmd(dirs.opencvInstallRoot));
+            await copyOpenCV();
         } else {
             log.info(`Remove the existing directory to force a clean install.`);
         }
     } else {
         log.info(`Installing to ${dirs.opencvInstallRoot}`, "");
-        await copy(dirs.opencvRoot, dirs.opencvInstallRoot, {
-            recursive: true,
-            errorOnExist: true,
-            overwrite: false
-        });
-        writeVersionInfo(getPackageVersion());
+        await copyOpenCV();
     }
 }
 
+const copyOpenCV = async () => {
+    await copy(dirs.opencvRoot, dirs.opencvInstallRoot, {
+        recursive: true,
+        errorOnExist: true,
+        overwrite: false
+    });
+    writeVersionInfo(getPackageVersion());
+};
+
 const getVersionInfoPath = () => join(dirs.opencvInstallRoot, "versioninfo.json");
 
 export function writeVersionInfo(version: string) {