open-browser 0.1.1.0 → 0.1.2.0

raw patch · 8 files changed

+47/−42 lines, 8 files

Files

• example/Main.hs +1/−1
• lib/Network/Browser.hs +3/−14
• lib/Network/Browser/Linux.hs +0/−12
• lib/Network/Browser/OSX.hs +0/−12
• lib/Web/Browser.hs +16/−0
• lib/Web/Browser/Linux.hs +12/−0
• lib/Web/Browser/OSX.hs +12/−0
• open-browser.cabal +3/−3

@@ -2,7 +2,7 @@ ( main ) where -import Network.Browser (openBrowser)+import Web.Browser (openBrowser)  main :: IO () main = openBrowser "http://haskell.org/" >>= print

@@ -1,16 +1,5 @@-module Network.Browser-( openBrowser+module Network.Browser {-# DEPRECATED "Use Web.Browser instead." #-}+( module Web.Browser ) where -import Data.List (isInfixOf)-import Network.Browser.Linux (openBrowserLinux)-import Network.Browser.OSX (openBrowserOSX)-import System.Info (os)---- |'openBrowser' opens a URL in the user's preferred web browser. Returns--- whether or not the operation succeeded.-openBrowser :: String -> IO Bool-openBrowser-    | "linux"  `isInfixOf` os = openBrowserLinux-    | "darwin" `isInfixOf` os = openBrowserOSX-    | otherwise               = error "unsupported platform"+import Web.Browser

@@ -1,12 +0,0 @@-module Network.Browser.Linux-( openBrowserLinux-) where--import System.Exit (ExitCode(..))-import System.Process (rawSystem)--openBrowserLinux :: String -> IO Bool-openBrowserLinux url = exitCodeToBool `fmap` rawSystem executable argv-    where (executable, argv) = ("xdg-open", [url])-          exitCodeToBool ExitSuccess     = True-          exitCodeToBool (ExitFailure _) = False

@@ -1,12 +0,0 @@-module Network.Browser.OSX-( openBrowserOSX-) where--import System.Exit (ExitCode(..))-import System.Process (rawSystem)--openBrowserOSX :: String -> IO Bool-openBrowserOSX url = exitCodeToBool `fmap` rawSystem executable argv-    where (executable, argv) = ("open", [url])-          exitCodeToBool ExitSuccess     = True-          exitCodeToBool (ExitFailure _) = False

@@ -0,0 +1,16 @@+module Web.Browser+( openBrowser+) where++import Data.List (isInfixOf)+import System.Info (os)+import Web.Browser.Linux (openBrowserLinux)+import Web.Browser.OSX (openBrowserOSX)++-- |'openBrowser' opens a URL in the user's preferred web browser. Returns+-- whether or not the operation succeeded.+openBrowser :: String -> IO Bool+openBrowser+    | "linux"  `isInfixOf` os = openBrowserLinux+    | "darwin" `isInfixOf` os = openBrowserOSX+    | otherwise               = error "unsupported platform"

@@ -0,0 +1,12 @@+module Web.Browser.Linux+( openBrowserLinux+) where++import System.Exit (ExitCode(..))+import System.Process (rawSystem)++openBrowserLinux :: String -> IO Bool+openBrowserLinux url = exitCodeToBool `fmap` rawSystem executable argv+    where (executable, argv) = ("xdg-open", [url])+          exitCodeToBool ExitSuccess     = True+          exitCodeToBool (ExitFailure _) = False

@@ -0,0 +1,12 @@+module Web.Browser.OSX+( openBrowserOSX+) where++import System.Exit (ExitCode(..))+import System.Process (rawSystem)++openBrowserOSX :: String -> IO Bool+openBrowserOSX url = exitCodeToBool `fmap` rawSystem executable argv+    where (executable, argv) = ("open", [url])+          exitCodeToBool ExitSuccess     = True+          exitCodeToBool (ExitFailure _) = False

@@ -1,5 +1,5 @@ name:                       open-browser-version:                    0.1.1.0+version:                    0.1.2.0 synopsis:                   Open a web browser from Haskell. description:                Open a web browser from Haskell.                             Currently only Linux and OS X are supported.@@ -17,8 +17,8 @@     location:               https://github.com/rightfold/open-browser.git  library-    exposed-modules:        Network.Browser-    other-modules:          Network.Browser.Linux, Network.Browser.OSX+    exposed-modules:        Network.Browser, Web.Browser+    other-modules:          Web.Browser.Linux, Web.Browser.OSX     hs-source-dirs:         lib     default-language:       Haskell2010     build-depends:          base >= 4 && < 5, process >= 1 && < 2