diff --git a/Rakefile b/Rakefile index e9ed4e3..56c8945 100644 --- a/Rakefile +++ b/Rakefile @@ -10,7 +10,9 @@ task :build do |t, args| cmd << '--trace' cmd << '--lsi' if ENV['LSI'] cmd << '--watch' if args.extras.include? 'watch' - cmd.concat(%w[--config _config.yml,_local.yml]) if File.file? '_local.yml' + unless ENV['JEKYLL_ENV'] == 'production' + cmd.concat(%w[--config _config.yml,_local.yml]) if File.file? '_local.yml' + end begin sh(*cmd) rescue Interrupt diff --git a/_config.yml b/_config.yml index 943aae3..54fb22b 100644 --- a/_config.yml +++ b/_config.yml @@ -168,6 +168,7 @@ exclude: - .github/ - .gitignore - .jekyll-assets-cache + - .ruby-lsp/ - .sass-cache - .travis.yml - .vscode diff --git a/script/deploy-actions.sh b/script/deploy-actions.sh index 33cd17b..47f7124 100755 --- a/script/deploy-actions.sh +++ b/script/deploy-actions.sh @@ -15,10 +15,11 @@ source_msg="$(git log -1 --pretty="[%h] %B")" pushd "$SRC" &>/dev/null e_info "Adding commit info" -git config user.name "${GIT_USER:-GitHub}" -git config user.email "${GIT_EMAIL:-noreply@github.com}" git add --all -git commit --quiet --message "${COMMIT_MSG}" --message "$source_msg" +git \ + -c user.name "${GIT_USER:-GitHub}" \ + -c user.email "${GIT_EMAIL:-noreply@github.com}" \ + commit --quiet --message "${COMMIT_MSG}" --message "$source_msg" e_info "Pushing to GitHub" SSH_AUTH_SOCK=none \ diff --git a/script/generate-cname.rb b/script/generate-cname.rb index ab8d380..6852a6f 100755 --- a/script/generate-cname.rb +++ b/script/generate-cname.rb @@ -4,7 +4,7 @@ require 'yaml' yaml_file = ARGV[0] || '_config.yml' -output_dir = ARGV[1] || '_site' +output_dir = ARGV[1] || ENV['SRC'] || '_site' config = YAML.load_file yaml_file, aliases: true File.open "#{output_dir}/CNAME", 'w' do |f| diff --git a/script/generate-redirects.rb b/script/generate-redirects.rb index e03637d..0a41eeb 100755 --- a/script/generate-redirects.rb +++ b/script/generate-redirects.rb @@ -7,7 +7,7 @@ yaml_file = ARGV[0] || '_config.yml' config = YAML.load_file yaml_file, aliases: true site_url = config['url'] || '' -site_dir = ARGV[1] || config['destination'] || '_site' +site_dir = ARGV[1] || ENV['SRC'] || config['destination'] || '_site' style = ENV['STYLE'] || 'cloudflare' rcode = case style