From f2d44084dce8d7de5e3f77b418ccc31e32bb2d0c Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Fri, 23 Feb 2018 00:00:41 +0530 Subject: [PATCH] build locales --- debian/gitlab.links | 2 ++ debian/maintscript | 1 + debian/postinst | 3 +++ debian/rake-tasks.sh | 6 +++++- debian/rules | 2 ++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/gitlab.links b/debian/gitlab.links index 5869d7d0ce..06feda180f 100644 --- a/debian/gitlab.links +++ b/debian/gitlab.links @@ -5,6 +5,8 @@ var/lib/gitlab/node_modules usr/share/gitlab/node_modules var/lib/gitlab/.ssh usr/share/gitlab/.ssh var/lib/gitlab/.bundle usr/share/gitlab/.bundle var/lib/gitlab/secrets.yml etc/gitlab/secrets.yml +var/lib/gitlab/locale usr/share/gitlab/app/assets/javascripts/locale +usr/share/gitlab/app/assets/javascripts/locale.static/index.js var/lib/gitlab/locale/index.js var/log/gitlab usr/share/gitlab/log var/log/gitlab/builds usr/share/gitlab/builds run/gitlab usr/share/gitlab/tmp diff --git a/debian/maintscript b/debian/maintscript index e85d2102f4..fad7020134 100644 --- a/debian/maintscript +++ b/debian/maintscript @@ -1,3 +1,4 @@ rm_conffile /etc/gitlab/initializers/devise_async.rb 8.8.2+dfsg-5 gitlab rm_conffile /etc/gitlab/gitlab.teatro.yml 8.11.3+dfsg1-1 gitlab rm_conffile /etc/gitlab/initializers/haml.rb 8.11.3+dfsg1-1 gitlab +dir_to_symlink /usr/share/gitlab/app/assets/javascripts/locale /var/lib/gitlab/locale 9.5.4+dfsg-5 gitlab diff --git a/debian/postinst b/debian/postinst index 4bd0b8ca2d..adde79ce78 100755 --- a/debian/postinst +++ b/debian/postinst @@ -109,6 +109,9 @@ case "$1" in # Create .bundle for .bundle/config mkdir -p ${gitlab_data_dir}/.bundle chown -R ${gitlab_user}: ${gitlab_data_dir}/.bundle + # Create locale for app/assets/javascripts/locale + mkdir -p ${gitlab_data_dir}/locale + chown -R ${gitlab_user}: ${gitlab_data_dir}/locale # Create more required directories for i in ${gitlab_repo_path} ${gitlab_cache_path} ${gitlab_uploads_path}\ ${gitlab_pid_path} ${gitlab_log_dir} ${gitlab_shell_log} ${gitlab_builds_log}; do diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh index 1b31cbd40c..d22734f529 100755 --- a/debian/rake-tasks.sh +++ b/debian/rake-tasks.sh @@ -28,16 +28,20 @@ runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:migrate' # Restrict permissions for secret files chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret -echo "Installing node modules" +echo "Installing node modules..." runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/node_modules' runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/jquery' runuser -u ${gitlab_user} -- sh -c 'npm install npm' runuser -u ${gitlab_user} -- sh -c 'node_modules/.bin/npm install' +runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/jquery' # workaround for broken libjs-jquery-atwho #890391 # npm i at.js won't work as it needs jquery@^1.7.0 as peer dependency runuser -u ${gitlab_user} -- sh -c 'wget -O /tmp/at.js.tar.gz `npm view at.js dist.tarball`' runuser -u ${gitlab_user} -- sh -c 'tar -C node_modules --transform "s/package/at.js/" -zxf /tmp/at.js.tar.gz' runuser -u ${gitlab_user} -- sh -c 'npm i document-register-element@1.3.0' +echo "Precompiling locales..." +runuser -u ${gitlab_user} -- sh -c 'bundle exec rake gettext:po_to_json' +echo "Webpacking..." runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/webpack' runuser -u ${gitlab_user} -- sh -c 'NODE_PATH=/usr/share/gitlab/node_modules webpack --config config/webpack.config.js' diff --git a/debian/rules b/debian/rules index 489ced0fde..80a8b94f40 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ override_dh_install: # Make sure we are installing all required files in debian/install sh debian/upstream-file-count-check.sh rm -rf debian/gitlab/usr/share/gitlab/tmp/* + mv debian/gitlab/usr/share/gitlab/app/assets/javascripts/locale \ + debian/gitlab/usr/share/gitlab/app/assets/javascripts/locale.static mv debian/gitlab/var/lib/gitlab/db/schema.rb debian/gitlab/var/lib/gitlab/db/schema.rb.template override_dh_installinit: