From c78ce746e56ed3c21bed6e16913561288554f6b0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 6 Dec 2011 01:10:53 +0200
Subject: [PATCH] updated ubuntu install scripts

---
 install/README             | 11 -----------
 install/README.md          |  8 ++++++++
 install/ubuntu_gitlab.sh   |  2 ++
 install/ubuntu_gitolite.sh |  3 ---
 4 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 install/README
 create mode 100644 install/README.md

diff --git a/install/README b/install/README
deleted file mode 100644
index 12aa8f40..00000000
--- a/install/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Ubuntu installation
-
-1. install git & generate ssh key
-2. install ruby 
-  ./ubuntu_ruby.sh
-3. install git user & gitolite with umask 0007
-  ./ubuntu_gitolite.sh
-4. logout
-5. install gitlabhq
-  ./ubuntu_gitlab.sh
-6 start server
diff --git a/install/README.md b/install/README.md
new file mode 100644
index 00000000..6e939ce7
--- /dev/null
+++ b/install/README.md
@@ -0,0 +1,8 @@
+## Ubuntu installation
+
+1. login as user, install git & generate ssh key
+2. sudo ./ubuntu_ruby.sh
+3. sudo ./ubuntu_gitolite.sh
+4. logout & login again
+5. sudo ./ubuntu_gitlab.sh
+6. start server
diff --git a/install/ubuntu_gitlab.sh b/install/ubuntu_gitlab.sh
index 43ed30aa..66530ccf 100755
--- a/install/ubuntu_gitlab.sh
+++ b/install/ubuntu_gitlab.sh
@@ -1,6 +1,8 @@
 sudo pip install pygments
 sudo apt-get install python-dev
 sudo gem install bundler
+git clone git://github.com/gitlabhq/gitlabhq.git
+cd gitlabhq
 bundle install --without development test
 bundle exec rake db:setup RAILS_ENV=production
 bundle exec rake db:seed_fu RAILS_ENV=production
diff --git a/install/ubuntu_gitolite.sh b/install/ubuntu_gitolite.sh
index f37ea8f8..383acb7b 100755
--- a/install/ubuntu_gitolite.sh
+++ b/install/ubuntu_gitolite.sh
@@ -7,9 +7,6 @@ sudo adduser \
   --home /home/git \
   git
 
-
-PATH=/home/dzaporozhets/bin:$PATH
-
 # Add your user to git group
 sudo usermod -a -G git `eval whoami`