Merge branch 'master' into webidl

Conflicts:
	grammars.yml

lib/linguist/language.rb

@@ -269,8 +269,12 @@ module Linguist
 
     # Public: A List of languages compatible with Ace.
     #
+    # TODO: Remove this method in a 5.x release. Every language now needs an ace_mode
+    # key, so this function isn't doing anything unique anymore.
+    #
     # Returns an Array of Languages.
     def self.ace_modes
+      warn "This method will be deprecated in a future 5.x release. Every language now has an `ace_mode` set."
       @ace_modes ||= all.select(&:ace_mode).sort_by { |lang| lang.name.downcase }
     end
 

lib/linguist/popular.yml

@@ -3,7 +3,6 @@
 # This file should only be edited by GitHub staff
 
 - ActionScript
-- Bash
 - C
 - C#
 - C++
@@ -27,3 +26,4 @@
 - SQL
 - Scala
 - Scheme
+- Shell

lib/linguist/shebang.rb

@@ -18,23 +18,32 @@ module Linguist
     #
     # Returns a String or nil
     def self.interpreter(data)
-      lines = data.lines
-      return unless match = /^#! ?(.+)$/.match(lines.first)
+      shebang = data.lines.first
 
-      tokens = match[1].split(' ')
-      script = tokens.first.split('/').last
+      # First line must start with #!
+      return unless shebang && shebang.start_with?("#!")
 
+      # Get the parts of the shebang without the #!
+      tokens = shebang.sub(/^#!\s*/, '').strip.split(' ')
+
+      # There was nothing after the #!
+      return if tokens.empty?
+
+      # Get the name of the interpreter
+      script = File.basename(tokens.first)
+
+      # Get next argument if interpreter was /usr/bin/env
       script = tokens[1] if script == 'env'
 
-      # If script has an invalid shebang, we might get here
+      # Interpreter was /usr/bin/env with no arguments
       return unless script
 
       # "python2.6" -> "python2"
-      script.sub! $1, '' if script =~ /(\.\d+)$/
+      script.sub! /(\.\d+)$/, ''
 
       # Check for multiline shebang hacks that call `exec`
       if script == 'sh' &&
-        lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
+        data.lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
         script = $1
       end