From 90a45f9729f131569889f52cf792007f23df3949 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 7 Jan 2017 00:59:01 -0500 Subject: tidy --- bin/index | 61 ----------------------------------------------------- bin/page | 12 ----------- bin/write-atomic | 21 ------------------ bin/write-ifchanged | 25 ---------------------- 4 files changed, 119 deletions(-) delete mode 100755 bin/index delete mode 100755 bin/page delete mode 100755 bin/write-atomic delete mode 100755 bin/write-ifchanged (limited to 'bin') diff --git a/bin/index b/bin/index deleted file mode 100755 index c3ac2ff..0000000 --- a/bin/index +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env ruby -# -*- coding: utf-8 -*- -require 'util' -require 'yaml' - -# ARGV[0] -type = ARGV.shift -template = "bin/index.#{type}.erb" -erb = ERB.new(File.read(template)); -erb.filename = template - -# ARGV[1] -@path = ARGV.shift -webpath = (@path+'/').sub(/^(src|out)\//, '/') -if type == 'atom' - webpath += 'index.atom' -end -@url = URI::parse('https://www.andrewdm.me/') + webpath - -indexyaml = @path.sub('out', 'src')+'/index.yaml' -if File.exists?(indexyaml) - metadata = YAML::load(File.read(indexyaml)) -else - metadata = {} -end - -@pages = [] -for data in metadata['external'] - @pages.push(ExternPage.new(data)) -end - -# ARGV[2..] -for filename in ARGV do - @pages.push(Page.new(filename)) -end - -# main -@title = metadata['title'] || @path.sub('out', '') - -def guess_section(page) - for path in @sections.keys do - if @url.route_to(page.url).to_s.start_with?(path+'/') - return path - end - end - return '' -end - -@sections = { '' => {'head' => '', 'body' => []} } -(metadata['sections'] || []).each do |path, name| - @sections[path] = { - 'head' => name, - 'body' => [] - } -end -for page in @pages do - section = page.section || guess_section(page) - @sections[section]['body'].push(page) -end - -erb.run() diff --git a/bin/page b/bin/page deleted file mode 100755 index e2d4f38..0000000 --- a/bin/page +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env ruby -# -*- coding: utf-8 -*- -require 'util' -require 'uri' - -template = "bin/page.#{ARGV[0]}.erb" -@page = Page.new(ARGV[1]) -@url = URI::parse('https://www.andrewdm.me/') + @page.absoutpath - -erb = ERB.new(File.read(template)); -erb.filename = template -erb.run() diff --git a/bin/write-atomic b/bin/write-atomic deleted file mode 100755 index efb2551..0000000 --- a/bin/write-atomic +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2015-2016 Luke Shumaker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -outfile=$1 -tmpfile="$(dirname "$outfile")/.tmp${outfile##*/}" - -cat > "$tmpfile" || { r=$?; rm -f "$tmpfile"; exit $r; } -mv -f "$tmpfile" "$outfile" diff --git a/bin/write-ifchanged b/bin/write-ifchanged deleted file mode 100755 index 185ceb0..0000000 --- a/bin/write-ifchanged +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2015 Luke Shumaker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -outfile=$1 -tmpfile="$(dirname "$outfile")/.tmp${outfile##*/}" - -cat > "$tmpfile" || exit $? -if cmp -s "$tmpfile" "$outfile"; then - rm -f "$tmpfile" || : -else - mv -f "$tmpfile" "$outfile" -fi -- cgit v1.2.3