improve backup dir resolution (#2442)

foxriver76 · web-flow · commit dfd2da550afc · 2023-09-20T08:51:02.000+02:00
- get rid of string manipulation which can lead to wrong results when no / at the end - closes #2441
diff --git a/packages/cli/src/lib/setup/setupBackup.ts b/packages/cli/src/lib/setup/setupBackup.ts
@@ -148,14 +148,11 @@ export class BackupRestore {
         }
     }
 
+    /**
+     * Get the directory where backups should be stored
+     */
     static getBackupDir(): string {
-        const dataDir = path.join(controllerDir, tools.getDefaultDataDir());
-
-        const parts = dataDir.split('/');
-        parts.pop(); // remove data or appName-data
-        parts.pop();
-
-        return path.normalize(`${parts.join('/')}/backups/`);
+        return path.join(tools.getRootDir(), 'backups/');
     }
 
     copyFileSync(source: string, target: string): void {

Original file line number	Diff line number	Diff line change
`@@ -148,14 +148,11 @@ export class BackupRestore {`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
	`151`	`+ /**`
	`152`	`+ * Get the directory where backups should be stored`
	`153`	`+ */`
`151`	`154`	`static getBackupDir(): string {`
`152`		`- const dataDir = path.join(controllerDir, tools.getDefaultDataDir());`
`153`		`-`
`154`		`- const parts = dataDir.split('/');`
`155`		`- parts.pop(); // remove data or appName-data`
`156`		`- parts.pop();`
`157`		`-`
`158`		- return path.normalize(`${parts.join('/')}/backups/`);
	`155`	`+ return path.join(tools.getRootDir(), 'backups/');`
`159`	`156`	`}`
`160`	`157`
`161`	`158`	`copyFileSync(source: string, target: string): void {`