1 files changed, 13 insertions, 33 deletions
diff --git a/share/provision/basic b/share/provision/basic
index a07fe71..11a4d7d 100755
--- a/share/provision/basic
+++ b/share/provision/basic
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #
-# Basic provision example
+# Basic provisioner example
 #
-# Copyright (C) 2017 Silvio Rhatto - rhatto at riseup.net
+# Copyright (C) 2020 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
@@ -26,47 +26,27 @@ DOMAIN="$2"
 MIRROR="$3"
 APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 
-# Ensure we're in the home folder
-cd
+# Upgrade
+if which hydractl &> /dev/null; then
+  hydractl upgrade
+else
+  sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean || exit 1
+fi
 
 # Dependencies
 echo "Installing basic dependencies..."
-$APT_INSTALL git curl make wipe man zsh || exit 1
+$APT_INSTALL zsh || exit 1
 
 # Set user shell
 if [ -x "/bin/zsh" ]; then
   sudo chsh -s /bin/zsh `whoami`
 fi
 
-# Tools
-if [ ! -e "apps/infection" ]; then
-  rm -rf apps
-  git clone --recursive https://git.fluxo.info/rhatto/apps
-  apps/infection init
-else
-  echo "Updating locally-installed apps and dotfiles..."
-  apps/infection fetch
-  apps/infection merge
-  apps/metadot/metadot fetch
-  apps/metadot/metadot merge
-fi
-
-# Load basic config
-apps/metadot/metadot load-bundle console
-apps/metadot/metadot deps-bundle console
+# Provision LSD
+$DIRNAME/lsd $HOSTNAME $DOMAIN $MIRROR
 
-# Install hydra system-wide
-apps/hydra/hydractl install
-
-# Install trashman system-wide
-sudo apps/trashman/trashman install trashman
-
-# Upgrade
-if which hydractl &> /dev/null; then
-  hydractl upgrade
-else
-  sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean || exit 1
-fi
+# Provision trashman
+#$DIRNAME/trashman $HOSTNAME $DOMAIN $MIRROR
 
 #
 # System tuning