X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=setup.sh;h=5452793a6a3cce6094d307773de33ab55c8297c7;hb=5979790a9b69991244ba796a4f79df5cb7878ee7;hp=41e7d5089c9e1f18924ef69543fd4ce905c4db80;hpb=f32e5dec81ec4011c7327c3273502aa4ce041df7;p=iankelling.org
diff --git a/setup.sh b/setup.sh
index 41e7d50..5452793 100755
--- a/setup.sh
+++ b/setup.sh
@@ -14,12 +14,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+source /a/bin/errhandle/err
usage() {
- cat </dev/null || $s apt-get -y install ffmpeg
pkgs=(
- # build.rb dependencies
- 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
+ # build.rb dependencies
+ 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 $deb8; then
- pkgs+=(build-essential ruby-dev)
+ pkgs+=(build-essential ruby-dev)
else
- pkgs+=(ruby-redcarpet)
+ pkgs+=(ruby-redcarpet)
fi
-
-$s apt-get -y install ${pkgs[@]}
+source /a/bin/distro-functions/src/package-manager-abstractions
+pi ${pkgs[@]}
if $deb8; then
- sudo gem install redcarpet
+ sudo gem install redcarpet
fi
chmod og+x _site/on2vote/vote.py
@@ -143,7 +143,7 @@ our \$home_text = "$script_dir/_site/gitweb_home.html";
our \$projects_list_group_categories = 1;
EOF
-web-conf $email_arg -p $port - apache2 $domain <
# to run python scripts with cgi