Merge pull request #255 from vitalygashkov/next

Fixed service config behavior, improved PATH user env setting, default archiver changed to system built-in `tar`
vitalygashkov · Nov 29, 2024 · 31723bc · 31723bc
2 parents 7f6ca60 + f594e53
commit 31723bc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/apps/cli b/apps/cli
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/lib/store.ts b/packages/core/lib/store.ts
@@ -5,15 +5,18 @@ import { getSettings } from './settings';
 import { importCookies } from './cookies';
 
 const createStorePath = (name: string) => {
+  // TODO: Make new store filename format
+  // const storePath = join(getSettings().servicesDir, `${name}.json`);
+  // if (fs.exists(storePath)) return storePath;
+
+  // Old store support
   const oldStoreDir = initDir(join(getSettings().servicesDir, name));
   const oldStorePath = join(oldStoreDir, 'config.json');
-  const storePath = join(getSettings().servicesDir, `${name}.json`);
   // Migrate from old store to new store
-  if (fs.exists(oldStorePath)) {
-    fs.renameSync(oldStorePath, storePath);
-    fs.delete(oldStorePath).then(() => fs.delete(oldStoreDir));
-  }
-  return storePath;
+  // if (fs.exists(oldStorePath)) {
+  //   fs.readText(oldStorePath).then((data) => fs.writeText(storePath, data));
+  // }
+  return oldStorePath;
 };
 
 const getCookiesFromTxt = async (dir: string) => {

diff --git a/packages/molnia b/packages/molnia