From a1b7c2d38ec092ae5658b81ddc77426b75d66458 Mon Sep 17 00:00:00 2001 From: mouchtaris Date: Sat, 22 May 2021 12:45:40 +0200 Subject: [PATCH] Consistently use INSTALL_PATH in /install.sh INSTALL_PATH and /var/lib are used alternatingly in the install script. Replace all hard-coded occurrences of `/var/lib` with `${INSTALL_PATH}` (as appropriate and following the script style). --- install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install b/install index 02f0f0b..4ce90d1 100644 --- a/install +++ b/install @@ -20,7 +20,7 @@ function run() { echo "Installing with no inventory git url; set later in $CONFIG_FILE" fi - if [[ -e /var/lib/aviary ]]; then + if [[ -e ${INSTALL_PATH}/aviary ]]; then echo "Found existing installation at $INSTALL_PATH; exiting" exit 1 fi @@ -28,7 +28,7 @@ function run() { 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 + ln -sf ${INSTALL_PATH}/aviary/av /usr/bin/av mkdir -p ${INSTALL_PATH}/aviary/inventory if [[ ! -z "$INVENTORY_GIT_URL" ]]; then