From d8778b6587a870f5eb36b5fd5e98297957adf429 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 18 Jan 2017 14:25:04 -0800 Subject: [PATCH] fix missing dependencies --- build.rb | 8 +++++++- gitweb-descriptions | 16 +++++++++++++++- setup.sh | 11 ++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/build.rb b/build.rb index 65264b6..b1a3411 100755 --- a/build.rb +++ b/build.rb @@ -94,7 +94,13 @@ stdpage('favorite-things', File.read('../favorite-things.html')) # we could use ruby native stuff here, but this was # better documented so meh. # Force because it's cache is not perfect, it definitely misses renamed symlinks. + +ret = 0 ["main", "gitweb-site"].each do |basename| cmd = "scss --force --cache-location ../.sass-cache" - system("#{cmd} ../css/#{basename}.scss css/#{basename}.css") + unless system("#{cmd} ../css/#{basename}.scss css/#{basename}.css") + ret = 1 + end end + +exit ret diff --git a/gitweb-descriptions b/gitweb-descriptions index 34c797f..cd6014b 100755 --- a/gitweb-descriptions +++ b/gitweb-descriptions @@ -1,4 +1,18 @@ #!/bin/bash -l +# Copyright (C) 2016 Ian Kelling + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 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 General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # my projects all have README or --help with a short single line # description which I parse and put into the gitweb description. @@ -59,7 +73,7 @@ gitweb-descriptions() { _git_desc_readme fi else - $f --help | sed -n '2p' > .git/description + ./$f --help | sed -n '2p' > .git/description fi else _git_desc_readme diff --git a/setup.sh b/setup.sh index cfcee75..59f3009 100755 --- a/setup.sh +++ b/setup.sh @@ -35,13 +35,22 @@ acme-tiny-wrapper $domain pkgs=( # build.rb dependencies - ruby-pygments.rb ruby-safe-yaml ruby-redcarpet + ruby-pygments.rb ruby-safe-yaml ruby-sass # python pkgs used for o(n^2) voting blog entry python-bcrypt python-passlib # gitweb pkgs gitweb highlight ) +if isdebian-stable; then + pkgs+=(build-essential ruby-dev) +else + pkgs+=(ruby-redcarpet) +fi + pi ${pkgs[@]} +if isdebian-stable; then + sudo gem install redcarpet +fi chmod og+x _site/on2vote/vote.py -- 2.30.2