summaryrefslogtreecommitdiff
path: root/social/diaspora-git/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'social/diaspora-git/PKGBUILD')
-rw-r--r--social/diaspora-git/PKGBUILD16
1 files changed, 14 insertions, 2 deletions
diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD
index 1cf183cf7..77a11d701 100644
--- a/social/diaspora-git/PKGBUILD
+++ b/social/diaspora-git/PKGBUILD
@@ -7,7 +7,11 @@
pkgbase=diaspora-git
pkgname=('diaspora-mysql-git' 'diaspora-postgresql-git' 'diaspora-sqlite-git')
+<<<<<<< HEAD
pkgver=20110623
+=======
+pkgver=20111229
+>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
pkgrel=1
pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network"
arch=('i686' 'x86_64')
@@ -39,18 +43,22 @@ build() {
if [[ -d $_gitname ]] ; then
pushd $_gitname
- git pull origin
+ $tsocks git pull origin
msg "The local files are updated."
popd
else
- git clone $_gitroot
+ $tsocks git clone $_gitroot
msg "Git clone done."
fi
msg "Start making..."
[[ -d $_gitname-build ]] && rm -fr $_gitname-build
+<<<<<<< HEAD
git clone $_gitname $_gitname-build
+=======
+ $tsocks git clone $_gitname $_gitname-build
+>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
# Include all gems
export GEM_HOME="${PWD}/vendor"
@@ -59,7 +67,11 @@ build() {
cd ${srcdir}/${_gitname}-build
+<<<<<<< HEAD
gem install bundler
+=======
+ $tsocks gem install bundler
+>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
}
# Helper