adblock2privoxy 1.2.3 → 1.2.4

raw patch · 3 files changed

+9/−6 lines, 3 files

Files

• adblock2privoxy.cabal +2/−2
• changelog +2/−2
• src/Main.hs +5/−2

@@ -1,5 +1,5 @@ name:           adblock2privoxy-version:        1.2.3+version:        1.2.4 cabal-version:  >= 1.6 build-type:     Simple author:         Alexey Zubritsky@@ -79,4 +79,4 @@ source-repository this                 type:     git                 location: ​http://projects.zubr.me/adblock2privoxy.git-                tag:      1.2.3+                tag:      1.2.4

@@ -1,5 +1,5 @@-1.2.3-	    * Documentation+1.2.4+	    * Documentation and bugfixes  1.1.0         * Tasks support to update privoxy config from same sources

@@ -16,6 +16,8 @@ import Data.Text.Lazy (unpack) import Network.Socket import System.FilePath+import Paths_adblock2privoxy (version)+import Data.Version (showVersion)  data Options = Options      { _showVersion :: Bool@@ -53,6 +55,7 @@       (opts,nonOpts,[]  ) ->                  case foldl (flip id) (Options False "" "" "" False) opts of                         Options False "" _ _ _ -> writeError "Privoxy dir is not specified.\n"+                        opts'@Options{_showVersion = True} -> return (opts', nonOpts)                         opts' -> return (setDefaults opts', nonOpts)       (_,_,errs) -> writeError $ concat errs    where@@ -98,9 +101,9 @@ main =  do          now <- getCurrentTime         args <- getArgs-        (Options showVersion privoxyDir webDir taskFile forced, urls) <- parseOptions args+        (Options printVersion privoxyDir webDir taskFile forced, urls) <- parseOptions args         let acton-                | showVersion = putStrLn "adblock2privoxy version 1.0"+                | printVersion = putStrLn $ "adblock2privoxy version " ++ (showVersion version)                 | not . null $ urls                     =    processSources privoxyDir webDir taskFile (makeInfo <$> urls)                 | not . null $ taskFile