diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-10-30 15:27:18 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-10-30 15:27:18 +0000 |
| commit | 24df604c39a3a9bef1345845796f1b628520dcd0 (patch) | |
| tree | 0f14360b1b7b9dd3591c844a3b0ebc98076c9393 /lib | |
| parent | 27f305b1fdaa450323719c5d78765ca99d1142e1 (diff) | |
| parent | 95a92efe385ebe21b8f31424f2cef86ea9c9455d (diff) | |
Merge remote-tracking branch 'origin/rails-3-develop' into rails-3-develop
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 |