Skip to content
This repository was archived by the owner on Feb 14, 2022. It is now read-only.

Commit d770635

Browse files
author
Simon Hofmann
committed
Changed default install dir to user home
1 parent 74a55f2 commit d770635

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Diff for: build/dirs.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
33
var path = require("path");
44
var utils_1 = require("./utils");
55
var env_1 = require("./env");
6+
var os_1 = require("os");
67
var rootDir = path.resolve(__dirname, '../');
78
var opencvRoot = path.join(rootDir, 'opencv');
89
var opencvSrc = path.join(opencvRoot, 'opencv');
@@ -13,7 +14,7 @@ var opencvInclude = path.join(opencvBuild, 'include');
1314
var opencvLibDir = utils_1.isWin() ? path.join(opencvBuild, 'lib/Release') : path.join(opencvBuild, 'lib');
1415
var opencvBinDir = utils_1.isWin() ? path.join(opencvBuild, 'bin/Release') : path.join(opencvBuild, 'bin');
1516
var autoBuildFile = path.join(opencvRoot, 'auto-build.json');
16-
var installDir = utils_1.isWin() ? path.resolve('/') : utils_1.isOSX() ? path.resolve('/usr/local/opt') : path.resolve('/opt/');
17+
var installDir = os_1.homedir();
1718
var installedOpenCV = path.resolve(path.join(installDir, 'opencv-prebuilt'));
1819
var installedOpencvBuild = path.join(installedOpenCV, 'build');
1920
var installedOpencvInclude = path.join(installedOpencvBuild, 'include');

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@nut-tree/opencv-build",
3-
"version": "3.4.6",
4-
"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)",
3+
"version": "3.4.6-home",
4+
"description": "A simple script to auto build recent OpenCV + contrib version via npm. Based on [justadudewhohacks/npm-opencv-build](https://github.com/justadudewhohacks/npm-opencv-build)",
55
"main": "./build/index.js",
66
"scripts": {
77
"build": "rm -rf build && tsc",

Diff for: src/dirs.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import * as path from 'path';
22

3-
import {isOSX, isWin} from './utils';
3+
import {isWin} from './utils';
44

55
import {isAutoBuildEnabled} from "./env";
6+
import {homedir} from "os";
67

78
const rootDir = path.resolve(__dirname, '../');
89
const opencvRoot = path.join(rootDir, 'opencv');
@@ -15,7 +16,7 @@ const opencvLibDir = isWin() ? path.join(opencvBuild, 'lib/Release') : path.join
1516
const opencvBinDir = isWin() ? path.join(opencvBuild, 'bin/Release') : path.join(opencvBuild, 'bin');
1617
const autoBuildFile = path.join(opencvRoot, 'auto-build.json');
1718

18-
const installDir = isWin() ? path.resolve('/') : isOSX() ? path.resolve('/usr/local/opt') : path.resolve('/opt/');
19+
const installDir = homedir();
1920
const installedOpenCV = path.resolve(path.join(installDir, 'opencv-prebuilt'));
2021

2122
const installedOpencvBuild = path.join(installedOpenCV, 'build');

0 commit comments

Comments
 (0)