Provision: cleanup

diff --git a/provision/desktop-basic b/provision/desktop-basic
index 6dacd4fbc8ed1dad285858fcf29fe93d8342162b..38d69e390b8afe1db0aac53a0472faa10c496f6e 100755 (executable)
--- 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 ee02b92d7037067c2dd57735508f03a97dd2ce3e..bca384786106407b0b8e57f72a80b3fb3ab53d5f 100755 (executable)
--- 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