This commit is contained in:
Alec Leamas 2010-10-30 15:48:33 +02:00
parent 668da620f1
commit 04984d576a
2 changed files with 7 additions and 3 deletions

View file

@ -199,6 +199,7 @@ popd
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle mkdir -p $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle
cp -ar vendor $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle cp -ar vendor $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle
cp -a Gemfile Gemfile.lock $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle
find %{buildroot}/%{_libdir}/diaspora-bundle \ find %{buildroot}/%{_libdir}/diaspora-bundle \
-type d -fprintf dirs '%%%dir "%%p"\n' -type d -fprintf dirs '%%%dir "%%p"\n'

View file

@ -4,6 +4,7 @@
# #
# Usage: # ./diaspora-setup [external hostname] # Usage: # ./diaspora-setup [external hostname]
# #
export PATH=$PATH:/usr/local/bin
arg_hostname="$1" arg_hostname="$1"
@ -22,10 +23,12 @@ test -n "$services" && {
cd /usr/share/diaspora/master cd /usr/share/diaspora/master
libdir=$(rpm --eval %_libdir)
rm -rf vendor rm -rf vendor
ln -s /usr/lib/diaspora-bundle/vendor . ln -s $libdir/diaspora-bundle/vendor .
ln -sf /usr/lib/diaspora-bundle/Gemfile . ln -sf $libdir/diaspora-bundle/Gemfile .
ln -sf /usr/lib/diaspora-bundle/Gemfile.lock . ln -sf $libdir/diaspora-bundle/Gemfile.lock .
test -e config/app_config.yml || test -e config/app_config.yml ||
cp config/app_config.yml.example config/app_config.yml cp config/app_config.yml.example config/app_config.yml