deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-06-26 09:20:04 +02:00
Code Issues Projects Releases Wiki Activity

Changed the way Tilde expansion is handeled in syncdir

Browse source
This commit is contained in:
root 2018-09-04 21:57:38 +10:00
parent ce311db18d
commit a7d5f76006
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.d
View file

@ -1,6 +1,6 @@
import core.stdc.stdlib: EXIT_SUCCESS, EXIT_FAILURE;
import core.memory, core.time, core.thread;
import std.getopt, std.file, std.path, std.process, std.stdio, std.conv;
import std.getopt, std.file, std.path, std.process, std.stdio, std.conv, std.algorithm.searching;
import config, itemdb, monitor, onedrive, selective, sync, util;
import std.net.curl: CurlException;
static import log;
@ -205,12 +205,19 @@ int main(string[] args)
// Set the local path OneDrive root
string syncDir;
if ((environment.get("SHELL") == "") && (environment.get("USER") == "")){
// at this point we ahve already done Tilde expansion.
//if ((environment.get("SHELL") == "") && (environment.get("USER") == "")){
// no shell or user set, so expandTilde() will fail
// syncDir = homePath ~ "OneDrive";
// } else {
// // A shell and user is set
// syncDir = expandTilde(cfg.getValue("sync_dir"));
// }
// if the sync dir still contains a ~ after Tilde expansion, and
if (canFind(cfg.getValue("sync_dir"),"~") ) {
syncDir = homePath ~ "OneDrive";
} else {
// A shell and user is set
syncDir = expandTilde(cfg.getValue("sync_dir"));
syncDir = cfg.getValue("sync_dir") ;
}
log.vlog("All operations will be performed in: ", syncDir);
if (!exists(syncDir)) mkdirRecurse(syncDir);