Revert "Sync changes from upstream repository"

dbussink · dbussink · commit 30ec6f73d02d · 2016-08-03T20:02:50.000+02:00
This reverts commit c0f8242.
diff --git a/.gitignore b/.gitignore
@@ -12,8 +12,6 @@
 !/assets/vendor/lunr.js/lunr.js
 !/assets/vendor/lunr.js/lunr.min.js
 
-_site/
-enterprise/
 output
 tmp
 .DS_Store
diff --git a/Rakefile b/Rakefile
@@ -20,10 +20,6 @@ task :build do
   end
 end
 
-task :build_latest_ent do
-  puts sh "script/enterprise-backport #{config[:versions].first} --keep"
-end
-
 desc "Test the output"
 task :test => [:remove_tmp_dir, :remove_output_dir, :build] do
   Rake::Task['spec'].invoke
@@ -84,9 +80,6 @@ end
 namespace :assets do
   task :precompile => [:build] do
     sh 'mv output _site/'
-    Rake::Task['build_latest_ent'].invoke
-    sh "mkdir -p _site/enterprise/#{config[:versions].first}"
-    sh "mv output/* _site/enterprise/#{config[:versions].first}"
   end
 end
 
diff --git a/script/enterprise-backport b/script/enterprise-backport
@@ -52,7 +52,7 @@ data_variables:
   Nanoc::Int::SiteLoader.new.new_with_config(versioned_config).compile
 
   puts `node_modules/gulp/bin/gulp.js assets`
-  raise unless $CHILD_STATUS.to_i == 0
+  fail unless $CHILD_STATUS.to_i == 0
 
   versioned_config
 end
diff --git a/tasks/utils.rake b/tasks/utils.rake
@@ -1,4 +1,3 @@
-require 'yaml'
 require 'json'
 require 'active_support/core_ext/hash'
 
@@ -9,3 +8,4 @@ end
 def symbolize_hash(hash)
   hash.deep_symbolize_keys
 end
+
diff --git a/tasks/versioning.rake b/tasks/versioning.rake
@@ -131,7 +131,3 @@ def cleanup
   FileUtils.rm_rf "#{VERSIONED_ENT_PATH}/assets/vendor"
   FileUtils.rm_rf "#{VERSIONED_ENT_PATH}/assets/images"
 end
-
-def keep?
-  ARGV.include?('--keep')
-end
