ebuild cosmetics

This commit is contained in:
Manuel Friedli 2015-04-09 10:46:45 +02:00
parent 9cf670f6fc
commit a8079f2878
2 changed files with 7 additions and 8 deletions

View File

@ -88,4 +88,4 @@ EBUILD gitlabhq-7.7.1.ebuild 10923 SHA256 c92d84d7c2a8a65b5876c39aa80d5c76eac8a2
EBUILD gitlabhq-7.7.2.ebuild 10938 SHA256 4c4336138456d9efe0cc7d6827c6c19be0edfeb874847202e566225e991e5991 SHA512 29d42285a1fdb55813d2811251ccdfd65b9a4eb62055191d038b0d1a2848476f68e639e4fa777260d200f36a8a7ab187b71339eff136126fd41a4478f31ff117 WHIRLPOOL c1657a6bc4d6af99d12ae562edcd84553b68b7996c7088b865c177cdb12236abd8e450e12755713ab42fb4d4418651da4ecaf8415d604de52546da208da93861
EBUILD gitlabhq-7.8.0.ebuild 10952 SHA256 5da8b8804b2bc89755c6be45aa057da0c34af34ac8b01e1a8fc4a95820fb8330 SHA512 cfd53fb5c9f07dc174b4985c66ba781f15eae514e153cf2a5d53e4ae753a23d086ed303b118e750ec4e6cf29a71f4fe486f091f301a06a8863b28d79fb9e5918 WHIRLPOOL 52fa14e9b6bbfacaa23f9629e0aee7c1557f0c913e9ed6ea10fb82fdc6dd3b43a406a05b104729b46448fe491e4d17cc05e12b3a7318f314263415231e687edf
EBUILD gitlabhq-7.8.1.ebuild 10966 SHA256 b5d3b822a4ce401b50909f0663bef4dacf7c9673c51bbbe2f600533f3bf7c365 SHA512 630b0b2bcda6fb7c5b407b4c094e35ad9de74ea9e6fd959f914f9944cd543ced2c3f9b1e8d3f98c6d3f1e0a3f6873e4ca64817ae3fe2aed61c4e656995e8ef62 WHIRLPOOL 3cede9b536a86cce0cc024a957d7b29c472cf60223ba9321bbe9e4b885cb9a58c3438d07708280a76dafb811551c3576559c4e6ec71b2050c3e81e88f460bce4
EBUILD gitlabhq-7.8.4.ebuild 11368 SHA256 f270fa3ed129bba6e1597673cd8668a57f540f18ab58375e6c588c54d22e07a2 SHA512 430d045396b7dc5450655571ad484b4245c2ac83fee2fe1c04f5238f16e5653833a5ef655443b6eb8c75cffa0c6ea8fe0a302fa33f4527b47e92693ad44d6ada WHIRLPOOL 973794a7492b89928fa7b44675e9a535285972d6db99c6caa80b0758c8af05634d32513797a36a8c7753d4b60b5d642bfab5ebe4abc44eaa362b0206da61d3dc
EBUILD gitlabhq-7.8.4.ebuild 11330 SHA256 46707df9b28dc26fb67c94fafb5533b1a2aebc5d8ede4c371c720c14691c4694 SHA512 678d7b000e4929272cf3a9a6f2585a34821f22da2e9b37a547bb6becc9265c3aef343dec3ed85f7beedc389d10d8b2f348dd2d02eaee0783fcf87f913ec8531c WHIRLPOOL 169c0860a31c95293c4d12a60c5dd4093c9762b8712258541fd0694d6324a1eb22b299b9fe12373ac51fb4a94307a433138d434f80447125249af04bb50ff0f6

View File

@ -99,7 +99,6 @@ all_ruby_prepare() {
ewarn "- /etc/gitlab-6 -> /etc/gitlab"
ewarn "- /opt/gitlab-6 -> /opt/gitlab"
ewarn "If you feel uncomfortable with this change, please abort the build now."
#[[ -z ${EPAUSE_IGNORE} ]] &&
sleep 5
# fix paths
@ -112,14 +111,14 @@ all_ruby_prepare() {
-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
local run_path=/run/${MY_NAME}
sed -i -E \
-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
-e "s|/home/git/gitlab|${DEST_DIR}|" \
config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
sed -i \
-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
@ -144,7 +143,7 @@ all_ruby_prepare() {
mv ${dbconf}.mysql ${dbconf}
rm ${dbconf}.postgresql
fi
# remove useless files
rm -r lib/support/{deploy,init.d}
use unicorn || rm config/unicorn.rb
@ -296,7 +295,7 @@ pkg_config() {
local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
local git_home="$(egethome ${MY_USER})"
# configure Git global settings
if [ ! -e "${git_home}/.gitconfig" ]; then
einfo "Setting git user"
@ -346,10 +345,10 @@ pkg_config() {
einfo "Initializing database ..."
exec_rake gitlab:setup
fi
einfo "Precompiling assests ..."
exec_rake assets:precompile
if [ "${update}" = 'true' ]; then
ewarn
ewarn "This configuration script runs only common migration tasks."