From c47f5a59120e788cdd16efc353e45b7154fccc3e Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Thu, 29 Apr 2021 11:50:22 -0400
Subject: [PATCH] appimage: Relocate squashfs-root/ to same dir as
 build_appimage.sh

---
 appimage/README.md         | 2 +-
 appimage/build_appimage.sh | 3 +--
 appimage/clean.sh          | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/appimage/README.md b/appimage/README.md
index b1c3010e4..95ff4d42d 100644
--- a/appimage/README.md
+++ b/appimage/README.md
@@ -18,7 +18,7 @@ NOTE: This script is intended to be run from a clean VM. You can also manually
 remove build artifacts by removing the following files and directories.
 
 - $HOME/.monkey_island (optional)
-- $HOME/squashfs-root
+- $HOME/appimage/squashfs-root
 - $HOME/git/monkey
 - $HOME/appimage/Infection_Monkey-x86_64.AppImage
 
diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index d04af81cf..d978f2d49 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APPDIR="$HOME/squashfs-root"
+APPDIR="./squashfs-root"
 CONFIG_URL="https://raw.githubusercontent.com/guardicore/monkey/develop/deployment_scripts/config"
 INSTALL_DIR="$APPDIR/usr/src"
 
@@ -112,7 +112,6 @@ setup_python_37_appdir() {
 
     ./"$PYTHON_APPIMAGE" --appimage-extract
     rm "$PYTHON_APPIMAGE"
-    mv ./squashfs-root "$APPDIR"
     mkdir -p "$INSTALL_DIR"
 }
 
diff --git a/appimage/clean.sh b/appimage/clean.sh
index 45d6e1755..5e2fd443a 100755
--- a/appimage/clean.sh
+++ b/appimage/clean.sh
@@ -4,6 +4,6 @@
 # in order to speed up development and debugging.
 
 rm -rf "$HOME/.monkey_island"
-rm -rf "$HOME/squashfs-root"
+rm -rf "$HOME/appimage/squashfs-root"
 rm -rf "$HOME/git/monkey"
 rm "$HOME/appimage/Infection_Monkey-x86_64.AppImage"