Merge b275eb83f9 into 895698fe40

fetch

@@ -19,6 +19,15 @@ export LC_ALL=C
 export LANG=C
 export LANGUAGE=C
 
+# osascript source for wallpaper detection on OSX
+wallsource="
+on run
+    tell application \"Finder\"
+        select window of desktop
+        return (get desktop picture as text)
+    end tell
+end run"
+
 
 # Config Options {{{
 
@@ -738,6 +747,12 @@ getwallpaper () {
             img="$(awk -F\' '/feh/ {printf $2}' $HOME/.fehbg)"
         ;;
 
+        "Mac OS X")
+            img="$(osascript -e "$wallsource" |
+                   sed 's/:/\//g' |
+                   sed 's/.*Users/\/Users/g')"
+        ;;
+
         "Windows")
             case "$distro" in
                 "Windows XP")