Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-19 04:35:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Program path bugfix + wget use contentFile

Browse Source
This commit is contained in:
Snarling 2023-04-28 11:42:35 -04:00
parent 8fd4eee8e9
commit 350679bc83
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NetscriptFunctions.ts
View File

@ -1626,7 +1626,7 @@ export const ns: InternalAPI<NSFull> = {
}); });
}); });
}, },
wget: (ctx) => async (_url, _target, _hostname) => { wget: (ctx) => (_url, _target, _hostname) => {
const url = helpers.string(ctx, "url", _url); const url = helpers.string(ctx, "url", _url);
const target = helpers.filePath(ctx, "target", _target); const target = helpers.filePath(ctx, "target", _target);
const hostname = _hostname ? helpers.string(ctx, "hostname", _hostname) : ctx.workerScript.hostname; const hostname = _hostname ? helpers.string(ctx, "hostname", _hostname) : ctx.workerScript.hostname;
@ -1640,11 +1640,7 @@ export const ns: InternalAPI<NSFull> = {
url, url,
function (data) { function (data) {
let res; let res;
if (hasScriptExtension(target)) { res = server.writeToContentFile(target, data);
res = server.writeToScriptFile(target, data);
} else {
res = server.writeToTextFile(target, data);
}
if (res.overwritten) { if (res.overwritten) {
helpers.log(ctx, () => `Successfully retrieved content and overwrote '${target}' on '${hostname}'`); helpers.log(ctx, () => `Successfully retrieved content and overwrote '${target}' on '${hostname}'`);
return resolve(true); return resolve(true);

2
src/Paths/ProgramFilePath.ts
View File

@ -9,7 +9,7 @@ export type ProgramFilePath = FilePath & WithProgramExtension;
export function hasProgramExtension(path: string): path is WithProgramExtension { export function hasProgramExtension(path: string): path is WithProgramExtension {
if (path.endsWith(".exe")) return true; if (path.endsWith(".exe")) return true;
const extension = path.substring(path.indexOf(".")); const extension = path.substring(path.indexOf("."));
return /^\.exe-[0-9]{1-2}\.[0-9]{2}%-INC$/.test(extension); return /^\.exe-[0-9]{1,2}\.[0-9]{2}%-INC$/.test(extension);
} }
/** Sanitize a player input, resolve any relative paths, and for imports add the correct extension if missing */ /** Sanitize a player input, resolve any relative paths, and for imports add the correct extension if missing */