From 244c5da0e765449280295ae82c92fb1452dfed27 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 5 Jul 2020 12:37:38 -0700
Subject: [PATCH] Update clone script.

---
 clone.sh | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/clone.sh b/clone.sh
index 436e0b3..933095b 100755
--- a/clone.sh
+++ b/clone.sh
@@ -4,15 +4,21 @@ set -ue
 
 # Script to clone and install
 
-if ! command -v git >/dev/null 2>&1 ; then
-  ( if [ "$EUID" != 0 ] ; then
-    sudo apt install -y git
-  else
-    apt install -y git
-    fi ) || ( echo 'Failed to install git!' >/dev/stderr; false)
-fi
+# Wrapped in a function to prevent incomplete execution if download is
+# interrupted
+function installer_main {
+  if ! command -v git >/dev/null 2>&1 ; then
+    ( if [ "$EUID" != 0 ] ; then
+      sudo apt install -y git
+    else
+      apt install -y git
+      fi ) || ( echo 'Failed to install git!' >/dev/stderr; false)
+  fi
 
-git clone https://github.com/Matir/skel.git ${HOME}/.skel
+  git clone https://github.com/Matir/skel.git ${HOME}/.skel
 
-${HOME}/.skel/install.sh
-${HOME}/.skel/install.sh packages minimal
+  ${HOME}/.skel/install.sh
+  ${HOME}/.skel/install.sh packages minimal
+}
+
+installer_main