Show correct backup path in help output

ad-si · May 14, 2024 · a8e50a2 · a8e50a2
1 parent 8d88cbe
commit a8e50a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tasklite-core/source/Cli.hs b/tasklite-core/source/Cli.hs
@@ -847,7 +847,9 @@ commandParser conf =
         "Show SQL commands to create and populate database")
 
     <> command "backup" (toParserInfo (pure Backup)
-        "Create a backup of the tasks database at ~/tasklite/backups")
+        ("Create a backup of the tasks database at "
+        <> T.pack conf.dataDir <> "/backups"))
+
     )
 
   <|> hsubparser
@@ -1111,9 +1113,7 @@ handleExternalCommand conf cmd argsMb = do
           then pretty (show exception :: Text)
           else do
             let
-              theHelp =
-                parserHelp defaultPrefs $
-                  (helper <*> commandParser conf)
+              theHelp = parserHelp defaultPrefs (helper <*> commandParser conf)
               newHeader =
                 Chunk
                   ( Just $

diff --git a/tasklite-core/source/ImportExport.hs b/tasklite-core/source/ImportExport.hs
@@ -712,7 +712,7 @@ dumpSql conf = do
   result <-
     readProcess
       "sqlite3"
-      [ dataDir conf </> dbName conf
+      [ conf.dataDir </> conf.dbName
       , ".dump"
       ]
       []
@@ -726,7 +726,7 @@ backupDatabase conf = do
   let
     fileUtcFormat = toFormat ("YYYY-MM-DDtHMI" :: [Char])
     backupDirName = "backups"
-    backupDirPath = dataDir conf </> backupDirName
+    backupDirPath = conf.dataDir </> backupDirName
     backupFilePath = backupDirPath </> timePrint fileUtcFormat now <> ".db"
 
   -- Create directory (and parents because of True)
@@ -736,7 +736,7 @@ backupDatabase conf = do
     pretty
       <$> readProcess
         "sqlite3"
-        [ dataDir conf </> dbName conf
+        [ conf.dataDir </> conf.dbName
         , ".backup '" <> backupFilePath <> "'"
         ]
         []
@@ -746,7 +746,7 @@ backupDatabase conf = do
       <> hardline
       <> pretty
         ( "✅ Backed up database \""
-            <> dbName conf
+            <> conf.dbName
             <> "\" to \""
             <> backupFilePath
             <> "\""