diff options
author | hut <hut@lepus.uberspace.de> | 2014-12-28 08:29:08 +0100 |
---|---|---|
committer | hut <hut@lepus.uberspace.de> | 2014-12-28 08:29:08 +0100 |
commit | 2ec8ec54cfc968dc03cb0078f24c5a668a0864cd (patch) | |
tree | 71a656bcf841ba37c97ecc91cedc3e3ce32b6d1e /ranger | |
parent | 20ea71805beafe299b707be7a570dfa94117b6cc (diff) | |
parent | c426f1f4b09b48cd5b87983e221e69dd5b585a8a (diff) | |
download | ranger-2ec8ec54cfc968dc03cb0078f24c5a668a0864cd.tar.gz |
Merge branch 'master' of https://github.com/aureooms/ranger
Diffstat (limited to 'ranger')
-rw-r--r-- | ranger/config/rifle.conf | 11 | ||||
-rw-r--r-- | ranger/data/mime.types | 22 |
2 files changed, 18 insertions, 15 deletions
diff --git a/ranger/config/rifle.conf b/ranger/config/rifle.conf index 4776cdf9..ef3a5b63 100644 --- a/ranger/config/rifle.conf +++ b/ranger/config/rifle.conf @@ -82,8 +82,8 @@ ext x?html?, has w3m, terminal = w3m "$@" # Define the "editor" for text files as first action mime ^text, label editor = $EDITOR -- "$@" mime ^text, label pager = "$PAGER" -- "$@" -!mime ^text, label editor, ext xml|csv|tex|py|pl|rb|sh|php = $EDITOR -- "$@" -!mime ^text, label pager, ext xml|csv|tex|py|pl|rb|sh|php = "$PAGER" -- "$@" +!mime ^text, label editor, ext xml|csv|tex|py|pl|rb|js|sh|php = $EDITOR -- "$@" +!mime ^text, label pager, ext xml|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@" ext 1 = man "$1" ext s[wmf]c, has zsnes, X = zsnes "$1" @@ -98,6 +98,7 @@ name ^[mM]akefile$ = make ext py = python -- "$1" ext pl = perl -- "$1" ext rb = ruby -- "$1" +ext js = node -- "$1" ext sh = sh -- "$1" ext php = php -- "$1" @@ -188,6 +189,6 @@ label wallpaper, number 13, mime ^image, X = feh --bg-center "$1" label wallpaper, number 14, mime ^image, X = feh --bg-fill "$1" # Define the editor for non-text files + pager as last action - !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php = ask -label editor, !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php = $EDITOR -- "$@" -label pager, !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php = "$PAGER" -- "$@" + !mime ^text, !ext xml|csv|tex|py|pl|rb|js|sh|php = ask +label editor, !mime ^text, !ext xml|csv|tex|py|pl|rb|js|sh|php = $EDITOR -- "$@" +label pager, !mime ^text, !ext xml|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@" diff --git a/ranger/data/mime.types b/ranger/data/mime.types index 2adc2e99..b3c3e8dc 100644 --- a/ranger/data/mime.types +++ b/ranger/data/mime.types @@ -10,15 +10,17 @@ # ############################################################################### -audio/flac flac -audio/musepack mpc mpp mp+ -audio/ogg oga ogg spx -audio/wavpack wv wvc +audio/flac flac +audio/musepack mpc mpp mp+ +audio/ogg oga ogg spx +audio/wavpack wv wvc -video/mkv mkv -video/webm webm -video/flash flv -video/ogg ogv ogm -video/divx div divx +video/mkv mkv +video/webm webm +video/flash flv +video/ogg ogv ogm +video/divx div divx + +text/x-ruby rb +application/javascript js -text/x-ruby rb |