[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-61-g2c9501e

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 65bfe7f0d47418011d3b58f0a511e3c43faf883f
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Aug 23 20:47:32 2011 +0200

    ruby-rails-2.3 has a different place : update link to it in postinst.
    
    Old place was /usr/share/rails-ruby1.8,
    new place is /usr/lib/ruby/vendor_ruby/rails.
    Stay compatible with older rails.

diff --git a/debian/postinst b/debian/postinst
index 2eb0e3b..9416f60 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -40,6 +40,11 @@ fRailsEnv=production
 fRailsLog=/var/log/redmine
 fRailsVar=/var/lib/redmine
 fRailsCache=/var/cache/redmine
+fRailsDir=/usr/lib/ruby/vendor_ruby/rails
+if [ ! -e "$fRailsDir" ]; then
+	# keep rails package compatibility
+	fRailsDir="/usr/share/rails-ruby1.8"
+fi
 
 case "$1" in
 	configure|reconfigure)
@@ -62,7 +67,14 @@ case "$1" in
 			rm -f vendor/rails
 		fi
 		if [ ! -L vendor/rails ]; then
-			ln -s /usr/share/rails-ruby1.8 vendor/rails
+			ln -s "$fRailsDir" vendor/rails
+		else
+			# rails 2.3 to ruby-rails-2.3 migration
+			fMigrateLink=$(readlink vendor/rails)
+			if [ "$fMigrateLink" != "$fRailsDir" ]; then
+				rm -f vendor/rails
+				ln -s "$fRailsDir" vendor/rails
+			fi
 		fi
 		if [ ! -e app/views/members ]; then
 			mkdir app/views/members

-- 
redmine.git