From efdc2179a4e88022f79ea2efd86616b6141f33ad Mon Sep 17 00:00:00 2001
From: Andrejus <hi@andrejus.uk>
Date: Wed, 26 Feb 2020 20:06:42 +0000
Subject: [PATCH] Log os-release version, dist-upgrade and leaner bootstrap

---
 bootstrap.sh      | 6 +++---
 install/00-apt.sh | 3 +++
 utils.sh          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 625ab5f..79ab7fc 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -37,17 +37,17 @@ set -o pipefail
 echo "setting up..."
 
 # Variables: $REPOSITORY
-if [ -z "$REPOSITORY" ]; then export REPOSITORY="andrejusk/dotfiles"; fi
+if [ -z "$REPOSITORY" ]; then REPOSITORY="andrejusk/dotfiles"; fi
 readonly repository_url="https://github.com/$REPOSITORY.git"
 echo "using repository: $repository_url"
 
 # Variables: $WORKSPACE
-if [ -z "$WORKSPACE" ]; then export WORKSPACE="$HOME/workspace"; fi
+if [ -z "$WORKSPACE" ]; then WORKSPACE="$HOME/workspace"; fi
 readonly dotfiles_dir="$WORKSPACE/dotfiles"
 echo "using dir: $dotfiles_dir"
 
 # Variables: $INSTALLER
-if [ -z "$INSTALLER" ]; then export INSTALLER="install.sh"; fi
+if [ -z "$INSTALLER" ]; then INSTALLER="install.sh"; fi
 readonly installer="$dotfiles_dir/$INSTALLER"
 echo "using installer: $installer"
 
diff --git a/install/00-apt.sh b/install/00-apt.sh
index 468b311..d17065c 100644
--- a/install/00-apt.sh
+++ b/install/00-apt.sh
@@ -13,3 +13,6 @@ upgrade
 # Package installs
 readonly package_list=$(cat $install_dir/$package_list_file) # Don't escape list
 install $package_list
+
+# Log version
+cat /etc/os-release
\ No newline at end of file
diff --git a/utils.sh b/utils.sh
index 699884b..d907abe 100644
--- a/utils.sh
+++ b/utils.sh
@@ -10,7 +10,7 @@ update() {
 # Non-interactive upgrade
 upgrade() {
     DEBIAN_FRONTEND=noninteractive \
-        sudo apt-get upgrade -y \
+        sudo apt-get dist-upgrade -y \
         -o Dpkg::Options::="--force-confdef" \
         -o Dpkg::Options::="--force-confold"
 }