X-Git-Url: https://iankelling.org/git/?p=iankelling.org;a=blobdiff_plain;f=setup.sh;h=cd4dfaa3358e99e49435790293423e9c06551e52;hp=deb61b9c26e6e3bf0613e0fcc791fbf805b00cf6;hb=35dea67c2f972fe7552820841f7c550129a6add0;hpb=956d10ee358397728a058b51551ccd031c226c31
diff --git a/setup.sh b/setup.sh
index deb61b9..cd4dfaa 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
# Copyright (C) 2016 Ian Kelling
# This program is free software: you can redistribute it and/or modify
@@ -14,33 +14,89 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# This script depends on a few other git repos of mine, such as
-# distro-functions, basic-https-conf, acme-tiny-wrapper
+source /a/bin/errhandle/err
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+usage() {
+ cat </dev/null || pi apache2
+type -P a2enmod &>/dev/null || $s apt-get -y install apache2
+type -P sqlite3 &>/dev/null || $s apt-get -y install sqlite3
+type -P ffmpeg &>/dev/null || $s apt-get -y install ffmpeg
-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
)
-pi ${pkgs[@]}
+if $deb8; then
+ pkgs+=(build-essential ruby-dev)
+else
+ pkgs+=(ruby-redcarpet)
+fi
+
+$s apt-get -y install ${pkgs[@]}
+if $deb8; then
+ sudo gem install redcarpet
+fi
chmod og+x _site/on2vote/vote.py
@@ -50,11 +106,11 @@ chmod og+x _site/on2vote/vote.py
# It's example apache config seems to say we can use cgi or cgid,
# and googling cgid it seems a newer faster alternative. I also
# depend on this in my o(n^2) python script.
-sudo a2enmod cgid
+$s a2enmod cgid
# additional settings from browsing https://git-scm.com/docs/gitweb.conf
-s dd of=/etc/gitweb.conf <
# to run python scripts with cgi
@@ -149,4 +207,5 @@ EOF
$script_dir/gitweb-descriptions $gitroot
$script_dir/build.rb
-s lnf -T $script_dir/_site /var/www/$domain/html
+$s rm -rf /var/www/$domain/html
+$s ln -sT $script_dir/_site /var/www/$domain/html