From 837e60b9d8826168896ad4155ff7046f00665f52 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 11 Jun 2017 05:56:10 +0300 Subject: WindowsEnv: {VarName,VarValue} -> {Name,Value} Also, fix compiler warnings (I've got too used to building with `--ghc-options -w`). --- app/Utils/PromptMessage.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/Utils/PromptMessage.hs') diff --git a/app/Utils/PromptMessage.hs b/app/Utils/PromptMessage.hs index 1315b85..609cb8f 100644 --- a/app/Utils/PromptMessage.hs +++ b/app/Utils/PromptMessage.hs @@ -15,24 +15,24 @@ import Text.Printf (printf) import qualified WindowsEnv -oldNewMessage :: WindowsEnv.Profile -> WindowsEnv.VarName -> WindowsEnv.VarValue -> WindowsEnv.VarValue -> String +oldNewMessage :: WindowsEnv.Profile -> WindowsEnv.Name -> WindowsEnv.Value -> WindowsEnv.Value -> String oldNewMessage profile name oldValue newValue = descrMsg ++ oldValueMsg ++ newValueMsg where profileKey = WindowsEnv.profileKeyPath profile descrMsg = printf "Saving variable '%s' to '%s'...\n" name $ show profileKey - oldValueMsg = printf "\tOld value: %s\n" $ WindowsEnv.varValueString oldValue - newValueMsg = printf "\tNew value: %s\n" $ WindowsEnv.varValueString newValue + oldValueMsg = printf "\tOld value: %s\n" $ WindowsEnv.valueString oldValue + newValueMsg = printf "\tNew value: %s\n" $ WindowsEnv.valueString newValue -newMessage :: WindowsEnv.Profile -> WindowsEnv.VarName -> WindowsEnv.VarValue -> String +newMessage :: WindowsEnv.Profile -> WindowsEnv.Name -> WindowsEnv.Value -> String newMessage profile name newValue = descrMsg ++ newValueMsg where profileKey = WindowsEnv.profileKeyPath profile descrMsg = printf "Saving variable '%s' to '%s'...\n" name $ show profileKey - newValueMsg = printf "\tNew value: %s\n" $ WindowsEnv.varValueString newValue + newValueMsg = printf "\tNew value: %s\n" $ WindowsEnv.valueString newValue -wipeMessage :: WindowsEnv.Profile -> WindowsEnv.VarName -> String +wipeMessage :: WindowsEnv.Profile -> WindowsEnv.Name -> String wipeMessage profile name = printf "Deleting variable '%s' from '%s'...\n" name $ show profileKey where -- cgit v1.2.3