From 34165b546bf7469aeb0e5bd6fdf3df6debdbbe3d Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Fri, 10 Mar 2017 04:55:17 -0800 Subject: [PATCH] remove dependency on my bashrc --- setup.sh | 63 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/setup.sh b/setup.sh index 59f3009..aafb072 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 @@ -20,16 +20,56 @@ set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR -script_dir=$(readlink -f "${BASH_SOURCE%/*}") -cd "$script_dir" +usage() { + cat </dev/null || pi apache2 -type -P sqlite3 &>/dev/null || pi sqlite3 +type -P a2enmod &>/dev/null || $s apt-get -y install apache2 +type -P sqlite3 &>/dev/null || $s apt-get -y install sqlite3 + acme-tiny-wrapper $domain @@ -41,14 +81,14 @@ pkgs=( # gitweb pkgs gitweb highlight ) -if isdebian-stable; then +if $deb8; then pkgs+=(build-essential ruby-dev) else pkgs+=(ruby-redcarpet) fi -pi ${pkgs[@]} -if isdebian-stable; then +$s apt-get -y install ${pkgs[@]} +if $deb8; then sudo gem install redcarpet fi chmod og+x _site/on2vote/vote.py @@ -60,11 +100,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 <