Update PR

* Update PR
This commit is contained in:
abraunegg 2023-09-09 06:57:52 +10:00
parent a656757a90
commit 34cb3031e8
2 changed files with 4 additions and 3 deletions

View file

@ -1446,7 +1446,7 @@ class ApplicationConfig {
driveIdDifferent = true;
}
if ((!sync_dir_present) && (configFileSyncDir != "")) {
if ((!sync_dir_present) && (configFileSyncDir != defaultSyncDir)) {
writeln("sync_dir newly added ... --resync needed");
configFileOptionsDifferent = true;
syncDirDifferent = true;
@ -1527,6 +1527,7 @@ class ApplicationConfig {
if (getValueBool("skip_dotfiles")) {
// --skip-dot-files passed in
log.vdebug("skip_dotfiles: CLI override of config file option, --resync needed");
skipDotFilesDifferent = true;
}
}
@ -1536,6 +1537,7 @@ class ApplicationConfig {
if (getValueBool("skip_symlinks")) {
// --skip-symlinks passed in
log.vdebug("skip_symlinks: CLI override of config file option, --resync needed");
skipSymbolicLinksDifferent = true;
}
}
}
@ -1550,7 +1552,6 @@ class ApplicationConfig {
log.vdebug("driveIdDifferent: ", driveIdDifferent);
log.vdebug("skipDotFilesDifferent: ", skipDotFilesDifferent);
if ((configFileOptionsDifferent) || (syncListFileDifferent) || (businessSharedItemsFileDifferent) || (syncDirDifferent) || (skipFileDifferent) || (skipDirDifferent) || (driveIdDifferent) || (skipDotFilesDifferent) || (skipSymbolicLinksDifferent) ) {
// set the flag
resyncRequired = true;

View file

@ -333,7 +333,6 @@ int main(string[] cliArgs) {
}
// Configure the sync direcory based on the runtimeSyncDirectory configured directory
log.log("All application operations will be performed in: ", runtimeSyncDirectory);
try {
if (!exists(runtimeSyncDirectory)) {
log.vdebug("runtimeSyncDirectory: Configured 'sync_dir' is missing locally. Creating: ", runtimeSyncDirectory);
@ -358,6 +357,7 @@ int main(string[] cliArgs) {
}
// Change the working directory to the 'sync_dir' as configured
log.log("All application operations will be performed in: ", runtimeSyncDirectory);
chdir(runtimeSyncDirectory);
// Do we need to validate the runtimeSyncDirectory to check for the presence of a '.nosync' file