minor refactor to app/Util.hs to make hlint happy

it remains intact in the README.md and package.yml files

ChangeLog.md

@@ -1,5 +1,10 @@
 # Changelog for passman
 
+## current
+
+- minor UI tweak
+- minor refactoring
+
 ## 0.3.1.1
 
 - updated documentation to on longer mention GitHub

README.md

@@ -38,8 +38,8 @@ This package uses [Haskell Stack](https://haskellstack.org).  Please
 refer to [their
 website](https://docs.haskellstack.org/en/stable/README/#how-to-install)
 for instructions on installing Haskell Stack.  Once you have done
-this, you can simply enter the command `stack install passman` in the
+this, you can simply enter the command `stack install` in the terminal
-terminal to install passman.
+from this directory to install passman.
 
 ## Codeberg
 

app/Main.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

app/Types.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

app/UI.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
@@ -142,7 +142,7 @@ buildData = do
 
 searchServ :: S.StateT Status IO ()
 searchServ = do
-  svc <- req $ prompt "service name: " reqResp
+  svc <- req $ prompt "\nservice name: " reqResp
   db  <- S.gets $ view database
   case pwSearch svc db of
     []  -> do

app/Util.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify
@@ -105,9 +105,9 @@ confirm :: String -> Request Bool
 confirm x = prompt (x ++ " (y/n): ") $ reqAgree Nothing $ fmap return reqChar
 
 loadFrom :: FilePath -> Request PWDatabase
-loadFrom path = reqDefault
+loadFrom path = fromMaybe newPWDatabase <$> reqDefault
   (reqIO (decodeFileStrict path))
-  (Just newPWDatabase) >>= (return . fromMaybe newPWDatabase)
+  (Just newPWDatabase)
 
 save :: S.StateT Status IO ()
 save = do

src/Password.hs

@@ -2,7 +2,7 @@
 
 Module:      Password
 Description: a simple password manager
-Copyright:   (C) 2018-2021 Jonathan Lamothe
+Copyright:   (C) Jonathan Lamothe
 License:     LGPLv3 (or later)
 Maintainer:  jonathan@jlamothe.net
 

test/Spec.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/JSON.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/NewPWData.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/NewPWDatabase.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/NewPWPolicy.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/NewPWSalt.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/PWGenerate.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/PWGetService.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/PWHasService.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/PWRemoveService.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/PWSearch.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/PWSetService.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/ValidatePWData.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/ValidatePWDatabase.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify

test/Spec/ValidatePWPolicy.hs

@@ -1,7 +1,7 @@
 {-
 
 passman
-Copyright (C) 2018-2021 Jonathan Lamothe
+Copyright (C) Jonathan Lamothe
 <jonathan@jlamothe.net>
 
 This program is free software: you can redistribute it and/or modify