Merge pull request #3 from arp242/f

Wrap install script in function to ensure it's downloaded fully

Author: dchester

install

@@ -2,41 +2,45 @@
 
 set -euo pipefail
 
-VERSION=1.3.2
-INSTALL_PATH=/var/lib
-AV_PATH=$INSTALL_PATH/aviary/av
-RELEASE_URL=https://gitlab.com/dchester/aviary.sh/-/archive/${VERSION}/aviary.sh-${VERSION}.tar.gz
-INVENTORY_GIT_URL=${1:-""}
-CONFIG_FILE=${INSTALL_PATH}/aviary/config
-
-# check for git dependency
-if ! /usr/bin/which git > /dev/null; then
-  echo "Please install git and try again"
-  exit 1
-fi
-
-if [[ -z "$INVENTORY_GIT_URL" ]]; then
-  echo "Installing with no inventory git url; set later in $CONFIG_FILE"
-fi
-
-if [[ -e /var/lib/aviary ]]; then 
-  echo "Found existing installation at $INSTALL_PATH; exiting"
-  exit 1
-fi
-
-echo Installing to ${INSTALL_PATH}...
-mkdir -p ${INSTALL_PATH}/aviary
-curl -s $RELEASE_URL | tar --strip-components=1 -C ${INSTALL_PATH}/aviary -xz
-ln -sf /var/lib/aviary/av /usr/bin/av
-mkdir -p ${INSTALL_PATH}/aviary/inventory
-
-if [[ ! -z "$INVENTORY_GIT_URL" ]]; then
-  echo "inventory_git_url=$INVENTORY_GIT_URL" >> $CONFIG_FILE
-fi
-
-echo Adding entry to /etc/crontab...
-echo "$(cat /etc/crontab | grep -v $AV_PATH)" > /etc/crontab
-echo "* * * * * root $AV_PATH directive >> /var/log/aviary-directive.log 2>&1" >> /etc/crontab
-echo "$(( RANDOM % 60 )) * * * * root $AV_PATH apply >> /var/log/aviary.log 2>&1" >> /etc/crontab
-
-echo Done
+function run() {
+  VERSION=1.3.2
+  INSTALL_PATH=/var/lib
+  AV_PATH=$INSTALL_PATH/aviary/av
+  RELEASE_URL=https://gitlab.com/dchester/aviary.sh/-/archive/${VERSION}/aviary.sh-${VERSION}.tar.gz
+  INVENTORY_GIT_URL=${1:-""}
+  CONFIG_FILE=${INSTALL_PATH}/aviary/config
+
+  # check for git dependency
+  if ! /usr/bin/which git > /dev/null; then
+    echo "Please install git and try again"
+    exit 1
+  fi
+
+  if [[ -z "$INVENTORY_GIT_URL" ]]; then
+    echo "Installing with no inventory git url; set later in $CONFIG_FILE"
+  fi
+
+  if [[ -e /var/lib/aviary ]]; then 
+    echo "Found existing installation at $INSTALL_PATH; exiting"
+    exit 1
+  fi
+
+  echo Installing to ${INSTALL_PATH}...
+  mkdir -p ${INSTALL_PATH}/aviary
+  curl -s $RELEASE_URL | tar --strip-components=1 -C ${INSTALL_PATH}/aviary -xz
+  ln -sf /var/lib/aviary/av /usr/bin/av
+  mkdir -p ${INSTALL_PATH}/aviary/inventory
+
+  if [[ ! -z "$INVENTORY_GIT_URL" ]]; then
+    echo "inventory_git_url=$INVENTORY_GIT_URL" >> $CONFIG_FILE
+  fi
+
+  echo Adding entry to /etc/crontab...
+  echo "$(cat /etc/crontab | grep -v $AV_PATH)" > /etc/crontab
+  echo "* * * * * root $AV_PATH directive >> /var/log/aviary-directive.log 2>&1" >> /etc/crontab
+  echo "$(( RANDOM % 60 )) * * * * root $AV_PATH apply >> /var/log/aviary.log 2>&1" >> /etc/crontab
+
+  echo Done
+}
+
+run  # Wrap in function to ensure entire script is downloaded.