From 1f4af6827840b203389a9266fcbe70b9ac68b663 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Thu, 29 Apr 2021 12:34:04 -0400 Subject: [PATCH] appimage: Use $WORKSPACE variable if present Jenkins sets a $WORKSPACE environment variable. We'll use this if it's been set. Otherwise, use $HOME. --- appimage/build_appimage.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh index d978f2d49..e39a85454 100755 --- a/appimage/build_appimage.sh +++ b/appimage/build_appimage.sh @@ -1,10 +1,12 @@ #!/bin/bash -APPDIR="./squashfs-root" +WORKSPACE=${WORKSPACE:-$HOME} + +APPDIR="$PWD/squashfs-root" CONFIG_URL="https://raw.githubusercontent.com/guardicore/monkey/develop/deployment_scripts/config" INSTALL_DIR="$APPDIR/usr/src" -GIT=$HOME/git +GIT=$WORKSPACE/git REPO_MONKEY_HOME=$GIT/monkey REPO_MONKEY_SRC=$REPO_MONKEY_HOME/monkey @@ -55,13 +57,13 @@ install_build_prereqs() { } install_appimage_tool() { - APP_TOOL_BIN=$HOME/bin/appimagetool + APP_TOOL_BIN=$WORKSPACE/bin/appimagetool - mkdir -p "$HOME"/bin + mkdir -p "$WORKSPACE"/bin curl -L -o "$APP_TOOL_BIN" "$APP_TOOL_URL" chmod u+x "$APP_TOOL_BIN" - PATH=$PATH:$HOME/bin + PATH=$PATH:$WORKSPACE/bin } load_monkey_binary_config() {