Provision: split web into web-basic and web-full scripts

diff --git a/share/provision/vpn b/share/provision/vpn
index 18f3e7c76a22299dad9c20d557937e492ad92118..ec4f5bad44df457bfaf1ac3d4f9a09e9cf5fcea7 100755 (executable)
--- a/share/provision/vpn
+++ b/share/provision/vpn
@@ -27,7 +27,7 @@ MIRROR="$3"
 APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 
 # Provision the basic stuff
-$DIRNAME/web $HOSTNAME $DOMAIN $MIRROR
+$DIRNAME/web-full $HOSTNAME $DOMAIN $MIRROR
 
 # Install OpenVPN and dnsutils (which provides nslookup)
 $APT_INSTALL openvpn resolvconf dnsutils curl

diff --git a/share/provision/web b/share/provision/web-basic
similarity index 83%
rename from share/provision/web
rename to share/provision/web-basic
index 73f25321abb2818d36debb07920d7cee93e19855..5fdbc73b610f61fe1c66c081a209e33d527f5557 100755 (executable)
--- a/share/provision/web
+++ b/share/provision/web-basic
@@ -27,23 +27,12 @@ MIRROR="$3"
 APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 
 # Provision the basic stuff
-$DIRNAME/tor-browser $HOSTNAME $DOMAIN $MIRROR
+$DIRNAME/desktop-basic $HOSTNAME $DOMAIN $MIRROR
 
 # Additional packages
 echo "Installing additional web packages..."
 $APT_INSTALL firefox-esr chromium
 
-# Luakit using stowpkg
-if [ ! -x "$HOME/apps/stowpkg/tree/`uname -m`/bin/luakit" ]; then
-  $APT_INSTALL make stow
-  apps/stowpkg/stowpkg install luakit
-else
-  apps/stowpkg/stowpkg upgrade luakit
-fi
-
-# Ensure we have an updated qutebrowser
-apps/qutebrowser/qutebrowser update
-
 # Mozilla configuration
 # Create this config using "cd $HOME && /bin/tar jcvf mozilla.tar.bz2 .mozilla"
 if [ ! -d "$HOME/.mozilla" ]; then

diff --git a/share/provision/web-full b/share/provision/web-full
new file mode 100755 (executable)
index 0000000..b44c76d
--- /dev/null
+++ b/share/provision/web-full
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+#
+# Web desktop 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"
+
+# Provision the basic stuff
+$DIRNAME/web-basic $HOSTNAME $DOMAIN $MIRROR
+
+# Tor
+$DIRNAME/tor-browser $HOSTNAME $DOMAIN $MIRROR
+
+# Luakit using stowpkg
+if [ ! -x "$HOME/apps/stowpkg/tree/`uname -m`/bin/luakit" ]; then
+  $APT_INSTALL make stow
+  apps/stowpkg/stowpkg install luakit
+else
+  apps/stowpkg/stowpkg upgrade luakit
+fi
+
+# Ensure we have an updated qutebrowser
+apps/qutebrowser/qutebrowser update