diff options
| author | Mark Longair <mhl@pobox.com> | 2013-12-03 10:56:37 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-12-03 10:56:37 +0000 |
| commit | 9e6810d0b86097e616192cf98554fc8ec664392a (patch) | |
| tree | ae1c07545539e2ac35952636b72327d9bb3b7f0b /script | |
| parent | b6f2d93f8daaffdc80cf656d7bfe4fbf933fb9eb (diff) | |
| parent | 2720064fc7978b922e373a5fc69029eaff8efc6d (diff) | |
Merge branch 'move-plugins-out-of-vendor-plugins' into rails-3-develop
Diffstat (limited to 'script')
| -rwxr-xr-x | script/compact-xapian-database | 2 | ||||
| -rwxr-xr-x | script/switch-theme.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/script/compact-xapian-database b/script/compact-xapian-database index f1a6058b0..982c0e878 100755 --- a/script/compact-xapian-database +++ b/script/compact-xapian-database @@ -4,7 +4,7 @@ export RAILS_ENV=$1 set -e if [ -x /usr/bin/xapian-compact ]; then - XAPIAN_DB_DIR=$( cd "$( dirname "$0" )" && pwd )/../vendor/plugins/acts_as_xapian/xapiandbs + XAPIAN_DB_DIR=$( cd "$( dirname "$0" )" && pwd )/../lib/acts_as_xapian/xapiandbs if [ -e "$XAPIAN_DB_DIR/$RAILS_ENV.new" ]; then echo >&2 "Didn't compact Xapian database because there was an existing database at $XAPIAN_DB_DIR/$RAILS_ENV.new" exit 1 diff --git a/script/switch-theme.rb b/script/switch-theme.rb index 03d59a2f9..e6afcebb9 100755 --- a/script/switch-theme.rb +++ b/script/switch-theme.rb @@ -113,7 +113,7 @@ symlink(File.join(full_theme_path, 'public'), 'alavetelitheme') symlink(full_theme_path, - File.join(alaveteli_directory, 'vendor', 'plugins'), + File.join(alaveteli_directory, 'lib', 'themes'), requested_theme) STDERR.puts """Switched to #{requested_theme}! |