Merge 8aa65e77619bb31128b3fd6cc6f6d6a7e36d69e6 into bb01f26f068b8e083e35fdf19dc9b36f8cf67068

This commit is contained in:
Dave Conway-Jones 2024-11-25 18:03:06 -05:00 committed by GitHub
commit 04214685f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -85,7 +85,10 @@ function init(_settings, _runtime) {
var ffBase = fspath.basename(flowsFullPath,ffExt);
flowsFileBackup = getBackupFilename(flowsFullPath);
credentialsFile = fspath.join(settings.userDir,ffBase+"_cred"+ffExt);
credentialsFile = fspath.join(settings.userDir,ffBase+"_cred"+ffExt); // if creds file exists in "old" location userdir then use it
if (!fs.existsSync(credentialsFile)) { // if not then locate it next to flows file in flows dir
credentialsFile = fspath.join(fspath.dirname(flowsFullPath), ffBase+"_cred"+ffExt);
}
credentialsFileBackup = getBackupFilename(credentialsFile)
var setupProjectsPromise;