Skip to content
Snippets Groups Projects
Commit 92c98343 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Merge branch 'expand-copy-command' into 'master'

Expand copy command

Switched Makefile to use full cp command, as the shortcut being used before not always being expanded, depending on the shell being used.

On Ubuntu the default shell for make is /bin/sh instead of /bin/bash, sh doesn't support expanding the curly braces on commands.

Fixes #6

Tested on Ubuntu 14.04

See merge request !7
parents 06c97ce7 80ffb5a4
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -20,7 +20,7 @@ gitlab/config/database.yml:
sed "s|/home/git|${gitlab_development_root}|" database.yml.example > gitlab/config/database.yml
 
gitlab/config/unicorn.rb:
cp gitlab/config/unicorn.rb{.example.development,}
cp gitlab/config/unicorn.rb.example.development gitlab/config/unicorn.rb
 
gitlab/config/resque.yml:
sed "s|/home/git|${gitlab_development_root}|" redis/resque.yml.example > $@
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment