[DRE-commits] [diaspora-installer] 15/23: use rsync, copy schema.rb

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit bb2f75466f826d0c5e49158e733302ee6ab033af
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jan 25 13:02:50 2017 +0530

    use rsync, copy schema.rb
---
 debian/control               | 1 +
 debian/diaspora-common.links | 1 +
 diaspora-common.conf         | 1 +
 diaspora-download.sh         | 6 ++----
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 13ffb14..db1697b 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Depends: build-essential,
          ruby (>= 2.0) | ruby-interpreter,
          ruby-dev,
          wget,
+         rsync
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: diaspora
diff --git a/debian/diaspora-common.links b/debian/diaspora-common.links
index accb5f3..725e51a 100644
--- a/debian/diaspora-common.links
+++ b/debian/diaspora-common.links
@@ -1,4 +1,5 @@
 run/diaspora usr/share/diaspora/tmp
 var/lib/diaspora/uploads usr/share/diaspora/public/uploads
 var/lib/diaspora/.bundle usr/share/diaspora/.bundle
+var/lib/diaspora/db/schema.rb usr/share/diaspora/db-schema.rb
 var/log/diaspora usr/share/diaspora/log
diff --git a/diaspora-common.conf b/diaspora-common.conf
index 221467c..497fa5d 100644
--- a/diaspora-common.conf
+++ b/diaspora-common.conf
@@ -10,6 +10,7 @@ export diaspora_database_yml_example=/usr/share/diaspora-common/database.yml
 export diaspora_database_yml_private=/var/lib/diaspora-common/database.yml
 export diaspora_database_yml=/etc/diaspora/database.yml
 export diaspora_home=/usr/share/diaspora
+export diaspora_user_home=/var/lib/diaspora
 export diaspora_cache=/var/cache/diaspora-installer
 export diaspora_scripts=/usr/lib/diaspora-common/scripts
 export diaspora_log_dir=/var/log/diaspora
diff --git a/diaspora-download.sh b/diaspora-download.sh
index c99b367..f222b27 100755
--- a/diaspora-download.sh
+++ b/diaspora-download.sh
@@ -33,10 +33,8 @@ echo "Copying files to ${diaspora_home}..."
     
 echo "diaspora archive to copy: ${diaspora_archive}"
 
-rm -rf ${diaspora_cache}/${diaspora_archive}/tmp 
-rm -rf ${diaspora_cache}/${diaspora_archive}/log
- 
-cp -r ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home}
+rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude db/schema.rb
+cp -r  ${diaspora_cache}/${diaspora_archive}/db/schema.rb ${diaspora_user_home}/db-schema.rb.template
 
 echo "Copying source tarball to ${diaspora_home}/public..."
 cp ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${diaspora_home}/public/source.tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git