diff options
| author | Mark Longair <mhl@pobox.com> | 2013-10-30 10:12:02 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-10-30 10:12:02 +0000 |
| commit | 95a92efe385ebe21b8f31424f2cef86ea9c9455d (patch) | |
| tree | c7d2530cf615cedc70cb463a9bc0f1c0c4de6729 /lib | |
| parent | 5964dc79a0e6608529ccf610460d1928811e8ef0 (diff) | |
| parent | 5aed12997b6d8950e20b1620fd643256ca56f818 (diff) | |
Merge branch 'switch-theme-script' into rails-3-develop
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/themes.rake | 2 | ||||
| -rw-r--r-- | lib/theme.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index a8d16f108..1eed92f1e 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -85,7 +85,7 @@ namespace :themes do def install_theme(theme_url, verbose, deprecated=false) deprecation_string = deprecated ? " using deprecated THEME_URL" : "" - theme_name = File.basename(theme_url, '.git') + theme_name = theme_url_to_theme_name theme_url puts "Installing theme #{theme_name}#{deprecation_string} from #{theme_url}" uninstall(theme_name, verbose) if installed?(theme_name) install_theme_using_git(theme_name, theme_url, verbose) diff --git a/lib/theme.rb b/lib/theme.rb new file mode 100644 index 000000000..4f03b5d99 --- /dev/null +++ b/lib/theme.rb @@ -0,0 +1,3 @@ +def theme_url_to_theme_name(theme_url) + File.basename theme_url, '.git' +end |