aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-03-16 11:04:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-03-16 11:04:55 -0300
commit2fa95cdf9e50f3ced1c4a23da0837c417cf2ac70 (patch)
tree2e9556d029a0d9c3ba09353459e68e6119000513
parent39320c65b0e4d1ec8f74f0bb0231e92de023327a (diff)
downloadkvmx-2fa95cdf9e50f3ced1c4a23da0837c417cf2ac70.tar.gz
kvmx-2fa95cdf9e50f3ced1c4a23da0837c417cf2ac70.tar.bz2
Provision: cleanup
-rwxr-xr-xprovision/desktop-basic18
-rwxr-xr-xprovision/development2
2 files changed, 7 insertions, 13 deletions
diff --git a/provision/desktop-basic b/provision/desktop-basic
index 6dacd4f..38d69e3 100755
--- a/provision/desktop-basic
+++ b/provision/desktop-basic
@@ -26,26 +26,18 @@ DOMAIN="$2"
MIRROR="$3"
APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
+# Provision the basic stuff
+$DIRNAME/development $HOSTNAME $DOMAIN $MIRROR
+
# Ensure we are in the user home folder
cd
-# Dependencies
-sudo sed -i -e "s|main$|main contrib non-free|g" /etc/apt/sources.list
-sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean
-$APT_INSTALL git
-
-# Tools
-if [ ! -e "apps" ]; then
- git clone --recursive https://git.fluxo.info/rhatto/apps
-else
- ( cd apps &> /dev/null && git pull && git submodule update --init )
-fi
-
-apps/inception init
+# Aditional metadot modules
apps/inception load-bundle desktop-basic
apps/inception deps-bundle desktop-basic
# Additional packages
+echo "Installing additional packages..."
$APT_INSTALL lightdm firefox-esr chromium torbrowser-launcher
# System-wide configuration
diff --git a/provision/development b/provision/development
index ee02b92..bca3847 100755
--- a/provision/development
+++ b/provision/development
@@ -27,6 +27,7 @@ MIRROR="$3"
APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
# Dependencies
+echo "Installing basic dependencies..."
sudo sed -i -e "s|main$|main contrib non-free|g" /etc/apt/sources.list
sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean
$APT_INSTALL git
@@ -35,6 +36,7 @@ $APT_INSTALL git
if [ ! -e "apps" ]; then
git clone --recursive https://git.fluxo.info/rhatto/apps
else
+ echo "Updating apps repository..."
( cd apps &> /dev/null && git pull && git submodule update --init )
fi