brew-test-bot: move html and css into subdirectory

Also updates the bash-completion to ignore subdirectories, rather than
specific filename patterns.

5 files changed, 3 insertions, 3 deletions

diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 435116540..089872a15 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -375,9 +375,9 @@ _brew ()
     done
 
     if [[ $i -eq $COMP_CWORD ]]; then
-        local ext=$(\ls $(brew --repository)/Library/Contributions/cmds \
+        local ext=$(\ls -p $(brew --repository)/Library/Contributions/cmds \
                 2>/dev/null | sed -e "s/\.rb//g" -e "s/brew-//g" \
-                -e "s/.*\.css.*//g" -e "s/.*\.erb.*//g")
+                -e "s/.*\///g")
         __brewcomp "
             --cache --cellar --config
             --env --prefix --repository
diff --git a/Library/Contributions/cmds/brew-test-bot.rb b/Library/Contributions/cmds/brew-test-bot.rb
index f927333f8..dab91805a 100755
--- a/Library/Contributions/cmds/brew-test-bot.rb
+++ b/Library/Contributions/cmds/brew-test-bot.rb
@@ -108,7 +108,7 @@ class Test
 
     if ARGV.include? "--html" and not @@css
       require 'erb'
-      root = HOMEBREW_CONTRIBUTED_CMDS
+      root = HOMEBREW_CONTRIBUTED_CMDS/"brew-test-bot"
       @@css = IO.read root + "brew-test-bot.css"
       @@index_html = ERB.new IO.read root + "brew-test-bot.index.html.erb"
       @@commit_html = ERB.new IO.read root + "brew-test-bot.commit.html.erb"
diff --git a/Library/Contributions/cmds/brew-test-bot.commit.html.erb b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.commit.html.erb
index c820263a7..c820263a7 100644
--- a/Library/Contributions/cmds/brew-test-bot.commit.html.erb
+++ b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.commit.html.erb
diff --git a/Library/Contributions/cmds/brew-test-bot.css b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.css
index 3fcefa59a..3fcefa59a 100644
--- a/Library/Contributions/cmds/brew-test-bot.css
+++ b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.css
diff --git a/Library/Contributions/cmds/brew-test-bot.index.html.erb b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.index.html.erb
index d5c5d6913..d5c5d6913 100644
--- a/Library/Contributions/cmds/brew-test-bot.index.html.erb
+++ b/Library/Contributions/cmds/brew-test-bot/brew-test-bot.index.html.erb