summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAliceReuter <>2019-04-30 04:44:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-04-30 04:44:00 (GMT)
commit677b4377bb1a03dd560eb674a677daaeddaf6c6f (patch)
treea840db717bdec1105e24233f76ae6e9670162b32
parentc30a5084066016acb04b452ac69ce971abe00f57 (diff)
version 0.1.2.19HEAD0.1.2.19master
-rw-r--r--README.md16
-rw-r--r--Villefort.cabal2
-rw-r--r--src/Villefort/Server.hs4
3 files changed, 10 insertions, 12 deletions
diff --git a/README.md b/README.md
index fd64e32..4754d1a 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
# Villefort
Villefort is a time management system written in Haskell.
-## Version 1.2.18
-- New json endpoint for active tasks
-- Improved logging
+## Version 1.2.19
+- New json endpoints
+- More informative output
+- Fixed configuration path in documentation
- [Emacs Ormode intergration](https://alicereuter.com/posts/Villefort%20Orgmode%20Integration.html)
## json api
@@ -27,7 +28,7 @@ alice$ curl localhost:3002/done
```
usage: Villefort [options]
options:
- -r, --recompile recompiles Villefort using a custom config file found in ~/.Villefort/villefort.hs
+ -r, --recompile recompiles Villefort using a custom config file found in ~/.villefort/villefort.hs
-h, prints this help manual
```
@@ -85,6 +86,8 @@ Use ```Villefort --recompile``` to recompile Villefort with your custom config.
The next time you run villefort it will run with your custom config. The default Config is found in Villefort.Config.
## How to copy data between versions of Villefort.
+All of Villefort's state is stored in todo.db to upgrade just install the new version and copy over the database. Remember to rebuild Villefort so that your custom build uses the new version of Villefort.
+
1. Install the new version through cabal.
2. Navigate to ~/.cabal .
3. Navigate to share/ .
@@ -109,8 +112,3 @@ Villefort-0.1.2.13/
|-- templates/
|-- js.js
```
-Just copy the data/todo.db from the old version into data/todo.db of the new version.
-Remember to rebuild Villefort so that your custom build uses the new version of Villefort.
-
- Villefort --recompile
-
diff --git a/Villefort.cabal b/Villefort.cabal
index 4bc372b..a20fa24 100644
--- a/Villefort.cabal
+++ b/Villefort.cabal
@@ -1,5 +1,5 @@
name: Villefort
-version: 0.1.2.18
+version: 0.1.2.19
synopsis: Villefort is a task manager and time tracker
description: Villefort is a web based time tracker built around a portable sqlite3 database.
homepage: https://github.com/alicereuter/Villefort#readme
diff --git a/src/Villefort/Server.hs b/src/Villefort/Server.hs
index 1687481..4dce853 100644
--- a/src/Villefort/Server.hs
+++ b/src/Villefort/Server.hs
@@ -54,10 +54,10 @@ villefort conf = do
let path = database conf
args <- getArgs
case args of
- ["--custom",_] -> putStrLn "launched custom" >> launch conf
+ ["--custom",_] -> putStrLn "launched custom build" >> launch conf
["--recompile"] -> re
["-r"] -> re
- ["-h"] -> putStrLn "usage: Villefort [options] " >> putStrLn " options:" >> putStrLn " -r, --recompile recompiles Villefort using a custom config file found in ~/.Villefort/villefort.hs" >> putStrLn " -h, prints this help manual"
+ ["-h"] -> putStrLn "usage: Villefort [options] " >> putStrLn " options:" >> putStrLn " -r, --recompile recompiles Villefort using a custom config file found in ~/.villefort/villefort.hs" >> putStrLn " -h, prints this help manual"
_ -> do
if noCustom conf
then launch conf