diff --git a/.gitignore b/.gitignore index c1299ed..9cc163d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ public/blog public/proj node_modules public/s42/.htaccess +public/images/blog +public/f diff --git a/Makefile b/Makefile index ee1673c..0f38b0a 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ publish_assets: combine publish_blog: blog publish_assets @echo ./bin/publish.sh --delete public/blog + ./bin/publish.sh public/f scp public/blog/posts.json bohodev.net:discussd/posts.json scp discussd/discussd.js bohodev.net:discussd/discussd.js scp public/s42/.htaccess samhuri.net:s42.ca/.htaccess diff --git a/bin/blog.rb b/bin/blog.rb index 39397ff..aa3d9af 100755 --- a/bin/blog.rb +++ b/bin/blog.rb @@ -111,7 +111,7 @@ class Blag code = shorten(i + 1) htaccess << "RewriteRule ^#{code}$ #{post[:url]} [R=301,L]" end - File.open(File.join(@dest, 's4,', '.htaccess'), 'w') do |f| + File.open(File.join(@dest, 's42', '.htaccess'), 'w') do |f| f.puts(htaccess) end end @@ -125,7 +125,7 @@ class Blag FileUtils.copy(file, File.join(@dest, 'f', File.basename(file))) end Dir[File.join(@src, 'images', '*')].each do |file| - FileUtils.copy(file, File.join(@dest, 'images', File.basename(file))) + FileUtils.copy(file, File.join(@dest, 'images', 'blog', File.basename(file))) end end diff --git a/public/f/.gitkeep b/public/f/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/public/images/blog/.gitkeep b/public/images/blog/.gitkeep new file mode 100644 index 0000000..e69de29