MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into budi-7583/filtering-data-provider-with-a-user-column-does-not-work

This commit is contained in:
Adria Navarro 2023-10-03 17:08:33 +02:00 committed by GitHub
parent da95c32a0c 8a8cc7773d
commit 4b23139bfe
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.11.5", "version": "2.11.6",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

16
packages/cli/src/prebuilds.ts
View File

@ -12,6 +12,10 @@ if (!process.argv[0].includes("node")) {
checkForBinaries() checkForBinaries()
} }
function localPrebuildPath() {
return join(process.execPath, "..", PREBUILDS)
}
function checkForBinaries() { function checkForBinaries() {
const readDir = join(__filename, "..", "..", "..", "cli", PREBUILDS, ARCH) const readDir = join(__filename, "..", "..", "..", "cli", PREBUILDS, ARCH)
if (fs.existsSync(PREBUILD_DIR) || !fs.existsSync(readDir)) { if (fs.existsSync(PREBUILD_DIR) || !fs.existsSync(readDir)) {
@ -19,17 +23,21 @@ function checkForBinaries() {
} }
const natives = fs.readdirSync(readDir) const natives = fs.readdirSync(readDir)
if (fs.existsSync(readDir)) { if (fs.existsSync(readDir)) {
const writePath = join(process.execPath, PREBUILDS, ARCH) const writePath = join(localPrebuildPath(), ARCH)
fs.mkdirSync(writePath, { recursive: true }) fs.mkdirSync(writePath, { recursive: true })
for (let native of natives) { for (let native of natives) {
const filename = `${native.split(".fake")[0]}.node` const filename = `${native.split(".fake")[0]}.node`
fs.cpSync(join(readDir, native), join(writePath, filename)) fs.cpSync(join(readDir, native), join(writePath, filename))
} }
console.log("copied something")
} }
} }
function cleanup(evt?: number) { function cleanup(evt?: number) {
// cleanup prebuilds first
const path = localPrebuildPath()
if (fs.existsSync(path)) {
fs.rmSync(path, { recursive: true })
}
if (evt && !isNaN(evt)) { if (evt && !isNaN(evt)) {
return return
} }
@ -41,10 +49,6 @@ function cleanup(evt?: number) {
) )
console.error(error(evt)) console.error(error(evt))
} }
const path = join(process.execPath, PREBUILDS)
if (fs.existsSync(path)) {
fs.rmSync(path, { recursive: true })
}
} }
const events = ["exit", "SIGINT", "SIGUSR1", "SIGUSR2", "uncaughtException"] const events = ["exit", "SIGINT", "SIGUSR1", "SIGUSR2", "uncaughtException"]