Rename linkwave to markam

1 files changed, 11 insertions, 12 deletions

diff --git a/src/paths.scm b/src/paths.scm
index 5f4f2d2..cfd8838 100644
--- a/src/paths.scm
+++ b/src/paths.scm
@@ -1,4 +1,4 @@
-;;; linkwave -- Store/retrieve/manage bookmarks
+;;; markam -- Store/retrieve/manage bookmarks
 ;; Copyright (C) 2012  Tom Willemsen <tom at ryuslash dot org>
 
 ;; This program is free software: you can redistribute it and/or modify
@@ -22,25 +22,24 @@
 
 (declare (unit paths))
 
-(define (stored-file xdg-env file)
-  ;; Get FILE either from `XDG-ENV/linkwave/' or from
-  ;; `$HOME/.linkwave/'.  Prefer any existing file over any other, but
-  ;; prefer files using XDG-ENV over `$HOME'.
-  (let ((xdg (get-environment-variable xdg-env))
-        (stored-file (string-append (get-environment-variable "HOME") "/.linkwave/" file)))
+(define (stored-file xdg-env file #!optional dir)
+  ;; Get FILE either from `XDG-ENV/markam/' or from `$HOME/.markam/'.
+  ;; Prefer any existing file over any other, but prefer files using
+  ;; XDG-ENV over `$HOME'.
+  (let* ((xdg (get-environment-variable xdg-env))
+         (dir (or dir "markam"))
+         (stored-file (string-append (get-environment-variable "HOME") "/." dir "/" file)))
     (unless (or (file-exists? stored-file) (not xdg))
-      (set! stored-file (string-append xdg "/linkwave/" file)))
+      (set! stored-file (string-append xdg "/" dir "/" file)))
     stored-file))
 
-(: config-file (string -> string))
 (define (config-file file)
   ;; Use `stored-file' to get configuration file FILE.  Configuration
   ;; files are stored under `$XDG_CONFIG_HOME' if the XDG standard is
   ;; used.
   (stored-file "XDG_CONFIG_HOME" file))
 
-(: data-file (string -> string))
-(define (data-file file)
+(define (data-file file #!optional dir)
   ;; Use `stored-file' to get data file FILE. Data files are stored
   ;; under `$XDG_DATA_HOME' if the XDG standard is used.
-  (stored-file "XDG_DATA_HOME" file))
+  (stored-file "XDG_DATA_HOME" file dir))