Provision: better dependencies

4 files changed, 37 insertions, 12 deletions

diff --git a/share/provision/openbox b/share/provision/openbox
new file mode 100755
index 0000000..26a6db0
--- /dev/null
+++ b/share/provision/openbox
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+#
+# Openbox provision example
+#
+# Copyright (C) 2017 Silvio Rhatto - rhatto at riseup.net
+#
+# 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 3 of the License,
+# or 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 <http://www.gnu.org/licenses/>.
+#
+
+# Parameters
+DIRNAME="`dirname $0`"
+BASENAME="`basename $0`"
+HOSTNAME="$1"
+DOMAIN="$2"
+MIRROR="$3"
+APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
+
+# Use a stacked window manager to reduce browser fingerprinting
+$APT_INSTALL openbox gmrun
+apps/metadot/metadot load openbox
+sed -i -e 's/^WINDOW_MANAGER=.*$/WINDOW_MANAGER="openbox"/' $HOME/.custom/xsession
diff --git a/share/provision/tor-browser b/share/provision/tor-browser
index b928164..a5b243b 100755
--- a/share/provision/tor-browser
+++ b/share/provision/tor-browser
@@ -27,12 +27,7 @@ MIRROR="$3"
 APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 
 # Provision the basic stuff
-$DIRNAME/desktop-basic $HOSTNAME $DOMAIN $MIRROR
-
-# Lave Tor available if the user wants to route other software besides running Tor Browser
-$APT_INSTALL tor
+$DIRNAME/web-full $HOSTNAME $DOMAIN $MIRROR
 
 # Use a stacked window manager to reduce browser fingerprinting
-$APT_INSTALL openbox gmrun
-apps/metadot/metadot load openbox
-sed -i -e 's/^WINDOW_MANAGER=.*$/WINDOW_MANAGER="openbox"/' $HOME/.custom/xsession
+$DIRNAME/openbox
diff --git a/share/provision/vpn b/share/provision/vpn
index df193a2..5722c3e 100755
--- a/share/provision/vpn
+++ b/share/provision/vpn
@@ -33,6 +33,4 @@ $DIRNAME/web-full $HOSTNAME $DOMAIN $MIRROR
 $APT_INSTALL openvpn resolvconf dnsutils curl
 
 # Use a stacked window manager to reduce browser fingerprinting
-$APT_INSTALL openbox gmrun
-apps/metadot/metadot load openbox
-sed -i -e 's/^WINDOW_MANAGER=.*$/WINDOW_MANAGER="openbox"/' $HOME/.custom/xsession
+$DIRNAME/openbox
diff --git a/share/provision/web-full b/share/provision/web-full
index 2676274..75f207d 100755
--- a/share/provision/web-full
+++ b/share/provision/web-full
@@ -32,8 +32,8 @@ $DIRNAME/web-basic $HOSTNAME $DOMAIN $MIRROR
 # LibreOffice
 $APT_INSTALL libreoffice
 
-# Tor
-$DIRNAME/tor-browser $HOSTNAME $DOMAIN $MIRROR
+# Lave Tor available if the user wants to route other software besides running Tor Browser
+$APT_INSTALL tor
 
 # Luakit using stowpkg
 #if [ ! -x "$HOME/apps/stowpkg/tree/`uname -m`/bin/luakit" ]; then