nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Error recovery

Browse source
This commit is contained in:
Alec Leamas 2010-10-27 13:27:40 +02:00
parent 7b14569571
commit 322faf3cc0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/fedora/make-dist.sh
View file

@ -252,8 +252,8 @@ function make_bundle()
rm -rf $bundle_name rm -rf $bundle_name
cd diaspora cd diaspora
rm Gemfile.lock rm Gemfile.lock
rm -rf .bundle
if [ "$BUNDLE_FIX" = 'yes' ]; then if [ "$BUNDLE_FIX" = 'yes' ]; then
rm -rf .bundle
bundle update bundle update
fi fi
@ -262,10 +262,12 @@ function make_bundle()
git checkout Gemfile git checkout Gemfile
build_git_gems Gemfile vendor/git build_git_gems Gemfile vendor/git
sed -i 's|git://.*/|vendor/git/|g' Gemfile sed -i 's|git://.*/|vendor/git/|g' Gemfile
rm -rf .bundle
# see: http://bugs.joindiaspora.com/issues/440 # see: http://bugs.joindiaspora.com/issues/440
bundle install --path=vendor/bundle || bundle install --path=vendor/bundle || {
bundle install --path=vendor/bundle rm -rf vendor/git/* .bundle
build_git_gems Gemfile vendor/git
bundle install --path=vendor/bundle
}
bundle package bundle package
mkdir -p "../$bundle_name/docs" mkdir -p "../$bundle_name/docs"