diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-08-04 14:17:56 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-08-04 14:17:56 +0100 |
| commit | fe9b10ec85ec3dd3c53525a33ea5c68e184d3e53 (patch) | |
| tree | c8e39ac8e8d0a994d177d3425d8df4ed88b5e803 /script | |
| parent | c9d8f483e727734a7f0afad9871df516e8c0470c (diff) | |
| parent | 2f1ba5fb364de990170d05e7dd81e8c0e2ef6e5f (diff) | |
Merge branch 'release/0.6.3' into develop
Conflicts:
locale/bs/app.po
locale/ca/app.po
locale/cs/app.po
locale/cy/app.po
locale/de/app.po
locale/es/app.po
locale/eu/app.po
locale/fr/app.po
locale/gl/app.po
locale/hu_HU/app.po
locale/id/app.po
locale/pt_BR/app.po
locale/sq/app.po
locale/sr@latin/app.po
Diffstat (limited to 'script')
| -rwxr-xr-x | script/rails-post-deploy | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/script/rails-post-deploy b/script/rails-post-deploy index 6100bb1d0..dd2e61877 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -82,12 +82,23 @@ fi bundle install $bundle_install_options +function run_post_install { + NAME=`echo $1 | sed -re 's/.*\/(.*)\.git.?/\1/'` + POST_INSTALL="vendor/plugins/$NAME/post_install.rb" + if [ -e $POST_INSTALL ] + then + echo "running post install script at $POST_INSTALL..." + script/runner $POST_INSTALL + fi +} + if [ -n "$OPTION_THEME_URLS" ] then for THEME in "${OPTION_THEME_URLS[@]}" do echo "Installing $THEME..." script/plugin install --force $THEME + run_post_install $THEME done fi @@ -96,12 +107,7 @@ if [ -n "$OPTION_THEME_URL" ] then echo "Installing $OPTION_THEME_URL using deprecated THEME_URL..." script/plugin install --force $OPTION_THEME_URL - NAME=`sed -re 's/.*\/(.*)\.git.?/\1/'` - POST_INSTALL="vendor/plugins/$NAME/post_install.rb" - if [ -e $POST_INSTALL ] - then - script/runner $POST_INSTALL - fi + run_post_install $OPTION_THEME_URL fi # upgrade database |