diff --git a/dna/workdir/dna-where/where.dna b/dna/workdir/dna-where/where.dna index 7ac8553d..56db4ff8 100644 Binary files a/dna/workdir/dna-where/where.dna and b/dna/workdir/dna-where/where.dna differ diff --git a/dna/workdir/happ-where/where.happ b/dna/workdir/happ-where/where.happ index 5fb52f5d..cb649a32 100644 Binary files a/dna/workdir/happ-where/where.happ and b/dna/workdir/happ-where/where.happ differ diff --git a/electron/package.json b/electron/package.json index 036c61ec..af6e1851 100644 --- a/electron/package.json +++ b/electron/package.json @@ -11,8 +11,8 @@ "start": "tsc && electron .", "build": "tsc && npm run dist", "tsc": "tsc", - "dist": "cp ../dna/workdir/happ-where/where.happ . && electron-builder build", - "dist-linux": "cp ../dna/workdir/happ-where/where.happ . && electron-builder --linux tar.gz", + "dist": "cp ../dna/workdir/happ-where/where.happ ./binaries && electron-builder build", + "dist-linux": "cp ../dna/workdir/happ-where/where.happ ./binaries && electron-builder --linux tar.gz", "lint": "eslint --ext .ts .", "clean": "rm -rf node_modules && rm -rf package-lock.json" }, @@ -29,6 +29,8 @@ "copyright": "© 2021-2022 Harris-Braun Enterprises, LLC", "asar": false, "files": [ + "dna/ludotheque_zome_hash.txt", + "dna/where_zome_hash.txt", "dist/**/*", "web/**/*", "binaries/**/*", diff --git a/electron/src/index.ts b/electron/src/index.ts index d18fed39..437dc23d 100644 --- a/electron/src/index.ts +++ b/electron/src/index.ts @@ -457,7 +457,10 @@ async function promptUid(canExitOnCancel: boolean) { app.quit(); } } else { - const sessionPath = path.join(g_sessionDataPath, "../") + let sessionPath = g_sessionDataPath; + if (g_uid) { + sessionPath = path.join(g_sessionDataPath, "../") + } const succeeded = addUidToDisk(r, sessionPath); //log('info', "promptUid() succeeded = " + succeeded) if (succeeded) { diff --git a/package.json b/package.json index c35732e2..246281da 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "build" : "bash scripts/build.sh", "build:ui" : "npm run build -w @where/elements && npm run package -w where-ui && npm run package -w ludotheque-ui", "build:webapp" : "hc web-app pack workdir", - "build:happ" : "npm run build:dna && hc app pack dna/workdir/happ-where", + "build:happ" : "npm run build:dna && hc app pack dna/workdir/happ-where && npm run hash-zome", "build:dna" : "npm run build:zome && hc dna pack dna/workdir/dna-where && hc dna pack dna/workdir/dna-ludotheque", "build:zome" : "CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown", "clean" : "bash scripts/clean.sh",