Skip to content

Fix build prepare1.8 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndu2 merged 4 commits into from
May 25, 2025
Merged

Fix build prepare1.8 #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
007b44b
Es6ify fixes, fix build
May 23, 2025
2d86f21
remove xdg-basedir
ndu2 May 23, 2025
87ef5d6
remove invoice 2
ndu2 May 23, 2025
2bc939c
configurable framedir to keep compatibility with 1.7
ndu2 May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove xdg-basedir
  • Loading branch information
@ndu2
ndu2 committed May 25, 2025
commit 2d86f21793efbbda8b190c1770e265b20fd0c817
37 changes: 18 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"colors": "^1.4.0",
"commander": "^14.0.0",
"csv-string": "^4.1.1",
"env-paths": "^3.0.0",
"find-in-files": "^0.5.0",
"hash-sum": "^2.0.0",
"hashids": "^2.3.0",
Expand All @@ -60,7 +61,6 @@
"tempfile": "^5.0.0",
"throttled-queue": "^2.1.4",
"underscore": "^1.13.7",
"xdg-basedir": "^5.1.0",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions src/include/file-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import fs from 'fs';
import shell from 'shelljs';
import path from 'path';
import os from 'os';
import {xdgData} from 'xdg-basedir';
import config from './config.js';
import yaml from 'read-yaml';
import hash from 'hash-sum';
import Fs from './filesystem.js';
import envPaths from 'env-paths';


/**
* file config with local and global configuration files
Expand All @@ -18,7 +19,6 @@ class fileConfig extends config {
*/
constructor(workDir) {
super();

this.assertGlobalConfig();
this.workDir = workDir;
this.data = Object.assign(this.data, this.localExists() ? this.parseLocal() : this.parseGlobal());
Expand Down Expand Up @@ -135,7 +135,7 @@ class fileConfig extends config {
}

get globalDir() {
return Fs.join(xdgData, '.gtt');
return envPaths(".gtt", {suffix:""}).data;
}

get frameDir() {
Expand Down