Permalink
Browse files

Remove support for the deprecated 'hard' option to babushka.me/up.

  • Loading branch information...
1 parent a825d1c commit 4bf98dd28b5204b7bdf6a9693a45e704fd430660 @benhoskings committed Oct 20, 2012
Showing with 2 additions and 13 deletions.
  1. +1 −2 app/controllers/bootstrap_controller.rb
  2. +1 −11 app/views/bootstrap/up.sh.erb
View
3 app/controllers/bootstrap_controller.rb
@@ -1,9 +1,8 @@
class BootstrapController < ApplicationController
def up
- deprecated_hard = (params[:ref] || '')[/\bhard\b/]
ref = (params[:ref] || '').sub(/^hard,?/, '').sub(/,?hard$/, '')
ref = 'master' if ref.blank?
- render action: 'up', layout: false, locals: {ref: ref, deprecated_hard: deprecated_hard}
+ render action: 'up', layout: false, locals: {ref: ref}
end
end
View
12 app/views/bootstrap/up.sh.erb
@@ -1,8 +1,7 @@
#!/bin/bash
-# These two are rendered per-request by the babushka webservice.
+# The ref is rendered per-request by the babushka webservice.
ref=<%= ref %>
-deprecated_hard=<%= deprecated_hard %>
# Can't use $HOME, because sometimes it's not set.
# Can't use ~, because it depends on $HOME to expand.
@@ -50,14 +49,6 @@ function install_pkgs {
esac
}
-function warn_about_deprecated_hard {
- if [ $deprecated_hard ]; then
- echo ""
- echo "### The 'hard' option is deprecated. Instead, just use the plain"
- echo "### babushka.me/up -- it only prompts when run on a terminal now."
- fi
-}
-
function logo {
echo ""
echo ". . . . "
@@ -219,7 +210,6 @@ function do_bootstrap {
handle_install && on_install_success || on_install_failure
}
-warn_about_deprecated_hard
logo
if check; then
if welcome; then

0 comments on commit 4bf98dd

Please sign in to comment.