ramm 0.0.15 → 0.0.18

package/dist/ramm.js

@@ -239,7 +239,7 @@ EOF`);
 };
 // src/files.ts
 import { appendFile, exists } from "fs/promises";
-var {write } = globalThis.Bun;
+var {file, write } = globalThis.Bun;
 
 // src/path.ts
 import { homedir } from "os";
@@ -253,7 +253,10 @@ function normalizePath(rawFilePath) {
 }
 
 // src/files.ts
-var finalizeWithNewline = (str) => {
+var normalizeFileContent = (str) => {
+  if (str === "") {
+    return str;
+  }
   if (str.at(-1) !== `
 `) {
     return str + `
@@ -270,11 +273,11 @@ var createDir = async (str) => {
   await execCommand(`mkdir -p ${dirname}`);
 };
 var checkStrInFile = async (filePath, str) => {
-  const file = Bun.file(filePath);
-  if (!await file.exists()) {
+  const file2 = Bun.file(filePath);
+  if (!await file2.exists()) {
     return false;
   }
-  const fileText = await file.text();
+  const fileText = await file2.text();
   if (fileText.includes(str)) {
     return true;
   }
@@ -293,13 +296,22 @@ var writeIfNew = async (rawFilePath, str) => {
   if (await checkStrInFile(filePath, str)) {
     return;
   }
-  await appendFile(filePath, finalizeWithNewline(str));
+  await appendFile(filePath, normalizeFileContent(str));
 };
 var writeFile = async (pathToFile, str) => {
   const normalizedPath = normalizePath(pathToFile);
   await createFileIfNeed(normalizedPath);
   await write(normalizedPath, str);
 };
+var writeFileIfNotMatch = async (pathToFile, str) => {
+  const normalizedPath = normalizePath(pathToFile);
+  await createFileIfNeed(normalizedPath);
+  const fileText = await file(normalizedPath).text();
+  if (fileText === str) {
+    return;
+  }
+  await write(normalizedPath, str);
+};
 // src/ssh.ts
 import { debug } from "console";
 var addKeyToHostConfig = async (pathToHost, address, pathToKey) => {
@@ -344,30 +356,35 @@ var createCron = async ({
   time,
   pathToFile
 }) => {
-  const constructedLine = `${time} ${pathToFile}`;
+  const pathToFileNorm = normalizePath(pathToFile);
+  const constructedLine = `${time} ${pathToFileNorm}`;
   const tempFile = `/tmp/cron_${new Date().getTime().toString()}`;
   const { output: cronConfig } = await execCommand("crontab -l");
   let newCronConfig = cronConfig;
   if (cronConfig.includes(constructedLine)) {
     return;
   }
-  if (cronConfig.includes(pathToFile)) {
+  if (cronConfig.includes(pathToFileNorm)) {
     newCronConfig = cronConfig.split(`
-`).filter((str) => !str.includes(pathToFile)).join(`
+`).filter((str) => !str.includes(pathToFileNorm)).join(`
 `);
   }
+  newCronConfig = normalizeFileContent(normalizeFileContent(cronConfig) + constructedLine);
   await writeFile(tempFile, newCronConfig);
+  await execCommand(`cat ${tempFile}`);
   await execCommand(`crontab ${tempFile}`);
   await execCommand(`rm ${tempFile}`);
 };
 export {
   writeIfNew,
+  writeFileIfNotMatch,
   writeFile,
   setupNftable,
   runPodmanContainerService,
   runPodmanContainer,
   restartSystemdService,
   normalizePath,
+  normalizeFileContent,
   installSystemPackage,
   installPodman,
   installBun,

package/dist/types/files.d.ts

@@ -1,2 +1,4 @@
+export declare const normalizeFileContent: (str: string) => string;
 export declare const writeIfNew: (rawFilePath: string, str: string) => Promise<void>;
 export declare const writeFile: (pathToFile: string, str: string) => Promise<void>;
+export declare const writeFileIfNotMatch: (pathToFile: string, str: string) => Promise<void>;

package/dist/types/ramm.d.ts

@@ -7,7 +7,7 @@ export { restartSystemdService } from "./systemd.ts";
 export { installSystemPackage } from "./packages.ts";
 export { debugBlock } from "./debug.ts";
 export { setupNftable } from "./nft.ts";
-export { writeIfNew, writeFile } from "./files.ts";
+export { writeIfNew, writeFile, writeFileIfNotMatch, normalizeFileContent, } from "./files.ts";
 export { createAndAddSshKey, getServerFingerprintBySsh, addKeyToHostConfig, } from "./ssh.ts";
 export { normalizePath } from "./path.ts";
 export { createCron } from "./cron.ts";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ramm",
   "type": "module",
-  "version": "0.0.15",
+  "version": "0.0.18",
   "scripts": {
     "build": "bun build ./src/ramm.ts --target bun --outdir ./dist && cp ./src/bun.sh ./dist/bun.sh && bun run types",
     "types": "tsc --project tsconfig.types.json"