better default video-viewer and browser

diff --git a/bin/booh b/bin/booh
index f84be524e34916a7b13d35d30444e19c1922a047..2e082da601b8439fde30537234589823f95fd04c 100644 (file)
--- a/bin/booh
+++ b/bin/booh
@@ -123,9 +123,9 @@ def read_config
             }
         end
     end
             }
         end
     end

-    $config['video-viewer'] ||= '/usr/bin/mplayer %f'
+    $config['video-viewer'] ||= '/usr/bin/mplayer %f || /usr/bin/vlc %f'

     $config['image-editor'] ||= '/usr/bin/gimp-remote %f || /usr/bin/gimp %f'
     $config['image-editor'] ||= '/usr/bin/gimp-remote %f || /usr/bin/gimp %f'

-    $config['browser'] ||= "/usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f || /usr/bin/firefox %f"
+    $config['browser'] ||= "/usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f || /usr/bin/firefox -remote 'openURL(%f,new-window)' || /usr/bin/firefox %f"

     $config['use-flv'] ||= "true"
     $config['flv-generator'] ||= "/usr/bin/ffmpeg -i %f -b 800k -ar 22050 -ab 32k %o"
     $config['comments-format'] ||= '%t'
     $config['use-flv'] ||= "true"
     $config['flv-generator'] ||= "/usr/bin/ffmpeg -i %f -b 800k -ar 22050 -ab 32k %o"
     $config['comments-format'] ||= '%t'

diff --git a/bin/booh-classifier b/bin/booh-classifier
index 029671d84fbd31560cadb1df7b9811348749c2df..1397168f9029dd9b60780ff1dc10300680714553 100644 (file)
--- a/bin/booh-classifier
+++ b/bin/booh-classifier
@@ -148,8 +148,8 @@ def read_config
             end
         }
     end
             end
         }
     end

-    $config['video-viewer'] ||= '/usr/bin/mplayer %f'
-    $config['browser'] ||= "/usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f"
+    $config['video-viewer'] ||= '/usr/bin/mplayer %f || /usr/bin/vlc %f'
+    $config['browser'] ||= "/usr/bin/mozilla-firefox -remote 'openURL(%f,new-window)' || /usr/bin/mozilla-firefox %f || /usr/bin/firefox -remote 'openURL(%f,new-window)' || /usr/bin/firefox %f"

     $config['preload-distance'] ||= '5'
     $config['cache-memory-use'] ||= 'memfree_80%'
     $config['rotate-set-exif'] ||= 'true'
     $config['preload-distance'] ||= '5'
     $config['cache-memory-use'] ||= 'memfree_80%'
     $config['rotate-set-exif'] ||= 'true'