Skip to content

Commit 145306b

Browse files
committed
package search -- have to specify starting point explicitly
1 parent 2e23b05 commit 145306b

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

src/packages/backend/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { FALLBACK_ACCOUNT_UUID } from "@cocalc/util/misc";
3434
import { packageDirectorySync } from "package-directory";
3535

3636
function determineRoot(): string {
37-
const pd = packageDirectorySync() ?? '/';
37+
const pd = packageDirectorySync({ cwd: __dirname }) ?? "/";
3838
const root = resolve(pd, "..", "..");
3939
process.env.COCALC_ROOT = root;
4040
return root;

src/packages/backend/sandbox/install.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ import { arch, platform } from "os";
1616
import { execFileSync, execSync } from "child_process";
1717
import { writeFile, stat, unlink, mkdir, chmod } from "fs/promises";
1818
import { join } from "path";
19+
import { packageDirectorySync } from "package-directory";
1920
import getLogger from "@cocalc/backend/logger";
2021

2122
const logger = getLogger("files:sandbox:install");
2223

23-
const i = __dirname.lastIndexOf("packages/backend");
2424
const binPath = join(
25-
__dirname.slice(0, i + "packages/backend".length),
26-
"node_modules/.bin",
25+
packageDirectorySync({ cwd: __dirname }) ?? "",
26+
"node_modules",
27+
".bin",
2728
);
2829

2930
interface Spec {

src/packages/project-runner/run/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const logger = getLogger("project-runner:util");
99

1010
let root: string | undefined = undefined;
1111
export async function ensureConfFilesExists(HOME: string): Promise<void> {
12-
root ??= await packageDirectory();
12+
root ??= await packageDirectory({ cwd: __dirname });
1313
if (!root) {
1414
throw Error("unable to determine package root");
1515
}

src/packages/project-runner/sea/build-tarball.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,15 @@ BIN=`dirname "$(realpath $0)"`
2727
git clone --depth=1 $BIN/../../../.. $TARGET
2828

2929
cd "$SRC"/packages
30-
rm -rf database hub next server file-server lite
30+
rm -rf database hub next server file-server lite frontend static assets cdn test
3131

3232
cd "$SRC"
33-
./workspaces.py install --exclude=database,hub,next,server,file-server,lite
34-
./workspaces.py build --exclude=database,hub,next,server,file-server,lite
33+
./workspaces.py install --exclude=database,hub,next,server,file-server,lite,cdn,frontend,static,assets,test
34+
./workspaces.py build --exclude=database,hub,next,server,file-server,lite,cdn,frontend,static,assets,test
3535

3636
cd "$SRC"/packages
3737
rm -rf node_modules && pnpm install --prod --package-import-method=copy
3838

39-
rm -rf cdn frontend static assets
40-
rm -rf static/dist/*.map static/dist/embed-*.js
41-
4239
cd node_modules/.pnpm
4340
rm -rf @next* next*
4441
rm -rf googleapis* @google*

0 commit comments

Comments
 (0)