Skip to content

Commit 1d81a91

Browse files
committed
Fixed uid-list issues and electron
1 parent f3e810c commit 1d81a91

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

dna/workdir/dna-where/where.dna

15.3 KB
Binary file not shown.

dna/workdir/happ-where/where.happ

26.5 KB
Binary file not shown.

electron/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"start": "tsc && electron .",
1212
"build": "tsc && npm run dist",
1313
"tsc": "tsc",
14-
"dist": "cp ../dna/workdir/happ-where/where.happ . && electron-builder build",
15-
"dist-linux": "cp ../dna/workdir/happ-where/where.happ . && electron-builder --linux tar.gz",
14+
"dist": "cp ../dna/workdir/happ-where/where.happ ./binaries && electron-builder build",
15+
"dist-linux": "cp ../dna/workdir/happ-where/where.happ ./binaries && electron-builder --linux tar.gz",
1616
"lint": "eslint --ext .ts .",
1717
"clean": "rm -rf node_modules && rm -rf package-lock.json"
1818
},
@@ -29,6 +29,8 @@
2929
"copyright": "© 2021-2022 Harris-Braun Enterprises, LLC",
3030
"asar": false,
3131
"files": [
32+
"dna/ludotheque_zome_hash.txt",
33+
"dna/where_zome_hash.txt",
3234
"dist/**/*",
3335
"web/**/*",
3436
"binaries/**/*",

electron/src/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,10 @@ async function promptUid(canExitOnCancel: boolean) {
457457
app.quit();
458458
}
459459
} else {
460-
const sessionPath = path.join(g_sessionDataPath, "../")
460+
let sessionPath = g_sessionDataPath;
461+
if (g_uid) {
462+
sessionPath = path.join(g_sessionDataPath, "../")
463+
}
461464
const succeeded = addUidToDisk(r, sessionPath);
462465
//log('info', "promptUid() succeeded = " + succeeded)
463466
if (succeeded) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"build" : "bash scripts/build.sh",
2929
"build:ui" : "npm run build -w @where/elements && npm run package -w where-ui && npm run package -w ludotheque-ui",
3030
"build:webapp" : "hc web-app pack workdir",
31-
"build:happ" : "npm run build:dna && hc app pack dna/workdir/happ-where",
31+
"build:happ" : "npm run build:dna && hc app pack dna/workdir/happ-where && npm run hash-zome",
3232
"build:dna" : "npm run build:zome && hc dna pack dna/workdir/dna-where && hc dna pack dna/workdir/dna-ludotheque",
3333
"build:zome" : "CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown",
3434
"clean" : "bash scripts/clean.sh",

0 commit comments

Comments
 (0)