diff options
| -rwxr-xr-x | provision/desktop-basic | 18 | ||||
| -rwxr-xr-x | provision/development | 2 |
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 |