From fa5bad03eff0e8972078e729495978516ba17d0d Mon Sep 17 00:00:00 2001
From: Ruben Davila <rdavila84@gmail.com>
Date: Mon, 22 Aug 2016 11:20:28 -0500
Subject: [PATCH] Fix: gdk-reconfigure fails when symlink for .ruby-version
file exists
```
[ruben@mbp ~/projects/gdk-ce (master *)]$ gdk reconfigure
(in /Users/ruben/projects/gdk-ce)
rm -f \
gitlab/config/gitlab.yml \
gitlab/config/database.yml \
gitlab/config/unicorn.rb \
gitlab/config/resque.yml \
gitlab-shell/config.yml \
redis/redis.conf \
Procfile
sed -e "s|/home/git|/Users/ruben/projects/gdk-ce|"\
gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
port= support/edit-gitlab.yml gitlab/config/gitlab.yml
gitlab_shell:
sed "s|/home/git|/Users/ruben/projects/gdk-ce|" database.yml.example > gitlab/config/database.yml
cp gitlab/config/unicorn.rb.example.development gitlab/config/unicorn.rb
echo "listen '/Users/ruben/projects/gdk-ce/gitlab.socket'" >> gitlab/config/unicorn.rb
sed "s|/home/git|/Users/ruben/projects/gdk-ce|" redis/resque.yml.example > gitlab/config/resque.yml
command -v bundler > /dev/null || gem install bundler
sed -e "s|/home/git|/Users/ruben/projects/gdk-ce|"\
-e "s|^gitlab_url:.*|gitlab_url: http+unix://%2FUsers%2Fruben%2Fprojects%2Fgdk-ce%2Fgitlab.socket|"\
-e "s|/usr/bin/redis-cli|/usr/local/bin/redis-cli|"\
-e "s|^ socket: .*| socket: /Users/ruben/projects/gdk-ce/redis/redis.socket|"\
gitlab-shell/config.yml.example > gitlab-shell/config.yml
GOPATH=/Users/ruben/projects/gdk-ce/gitlab-workhorse go install gitlab.com/gitlab-org/gitlab-workhorse/...
ln -s /Users/ruben/projects/gdk-ce/gitlab/.ruby-version .ruby-version
ln: .ruby-version: File exists
make: *** [.ruby-version] Error 1
```
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 914d803..9ab0939 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,7 @@ foreman:
command -v $@ > /dev/null || gem install $@
.ruby-version:
- ln -s ${gitlab_development_root}/gitlab/.ruby-version $@
+ ln -nfs ${gitlab_development_root}/gitlab/.ruby-version $@
localhost.crt: localhost.key
--
GitLab