mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
Include version in default-generated .taskrc (#3500)
This will avoid new users being prompted with all the news since 2.5.0.
This commit is contained in:
parent
c44229dd32
commit
5f983a66af
1 changed files with 8 additions and 8 deletions
|
@ -40,6 +40,7 @@
|
||||||
#include <Variant.h>
|
#include <Variant.h>
|
||||||
#include <Datetime.h>
|
#include <Datetime.h>
|
||||||
#include <Duration.h>
|
#include <Duration.h>
|
||||||
|
#include <Version.h>
|
||||||
#include <shared.h>
|
#include <shared.h>
|
||||||
#include <format.h>
|
#include <format.h>
|
||||||
#include <main.h>
|
#include <main.h>
|
||||||
|
@ -1216,10 +1217,6 @@ void Context::createDefaultConfig ()
|
||||||
! confirm ( format ("A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so Taskwarrior can proceed?", home_dir, rc_file._data)))
|
! confirm ( format ("A configuration file could not be found in {1}\n\nWould you like a sample {2} created, so Taskwarrior can proceed?", home_dir, rc_file._data)))
|
||||||
throw std::string ("Cannot proceed without rc file.");
|
throw std::string ("Cannot proceed without rc file.");
|
||||||
|
|
||||||
// Override data.location in the defaults.
|
|
||||||
auto loc = configurationDefaults.find ("data.location=~/.task");
|
|
||||||
// loc+0^ +14^ +21^
|
|
||||||
|
|
||||||
Datetime now;
|
Datetime now;
|
||||||
std::stringstream contents;
|
std::stringstream contents;
|
||||||
contents << "# [Created by "
|
contents << "# [Created by "
|
||||||
|
@ -1227,10 +1224,10 @@ void Context::createDefaultConfig ()
|
||||||
<< ' '
|
<< ' '
|
||||||
<< now.toString ("m/d/Y H:N:S")
|
<< now.toString ("m/d/Y H:N:S")
|
||||||
<< "]\n"
|
<< "]\n"
|
||||||
<< configurationDefaults.substr (0, loc + 14)
|
<< "data.location=" << data_dir._original << "\n"
|
||||||
<< data_dir._original
|
<< "news.version=" << Version::Current() << "\n"
|
||||||
<< "\n\n# To use the default location of the XDG directories,\n"
|
<< "\n# To use the default location of the XDG directories,\n"
|
||||||
<< "# move this configuration file from ~/.taskrc to ~/.config/task/taskrc and uncomment below\n"
|
<< "# move this configuration file from ~/.taskrc to ~/.config/task/taskrc and update location config as follows:\n"
|
||||||
<< "\n#data.location=~/.local/share/task\n"
|
<< "\n#data.location=~/.local/share/task\n"
|
||||||
<< "#hooks.location=~/.config/task/hooks\n"
|
<< "#hooks.location=~/.config/task/hooks\n"
|
||||||
<< "\n# Color theme (uncomment one to use)\n"
|
<< "\n# Color theme (uncomment one to use)\n"
|
||||||
|
@ -1253,6 +1250,9 @@ void Context::createDefaultConfig ()
|
||||||
// Write out the new file.
|
// Write out the new file.
|
||||||
if (! File::write (rc_file._data, contents.str ()))
|
if (! File::write (rc_file._data, contents.str ()))
|
||||||
throw format ("Could not write to '{1}'.", rc_file._data);
|
throw format ("Could not write to '{1}'.", rc_file._data);
|
||||||
|
|
||||||
|
// Load it so that it takes effect for this run.
|
||||||
|
config.load(rc_file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue