appimage: Relocate squashfs-root/ to same dir as build_appimage.sh

This commit is contained in:
Mike Salvatore 2021-04-29 11:50:22 -04:00
parent 7276760c6a
commit c47f5a5912
3 changed files with 3 additions and 4 deletions

View File

@ -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. remove build artifacts by removing the following files and directories.
- $HOME/.monkey_island (optional) - $HOME/.monkey_island (optional)
- $HOME/squashfs-root - $HOME/appimage/squashfs-root
- $HOME/git/monkey - $HOME/git/monkey
- $HOME/appimage/Infection_Monkey-x86_64.AppImage - $HOME/appimage/Infection_Monkey-x86_64.AppImage

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
APPDIR="$HOME/squashfs-root" APPDIR="./squashfs-root"
CONFIG_URL="https://raw.githubusercontent.com/guardicore/monkey/develop/deployment_scripts/config" CONFIG_URL="https://raw.githubusercontent.com/guardicore/monkey/develop/deployment_scripts/config"
INSTALL_DIR="$APPDIR/usr/src" INSTALL_DIR="$APPDIR/usr/src"
@ -112,7 +112,6 @@ setup_python_37_appdir() {
./"$PYTHON_APPIMAGE" --appimage-extract ./"$PYTHON_APPIMAGE" --appimage-extract
rm "$PYTHON_APPIMAGE" rm "$PYTHON_APPIMAGE"
mv ./squashfs-root "$APPDIR"
mkdir -p "$INSTALL_DIR" mkdir -p "$INSTALL_DIR"
} }

View File

@ -4,6 +4,6 @@
# in order to speed up development and debugging. # in order to speed up development and debugging.
rm -rf "$HOME/.monkey_island" rm -rf "$HOME/.monkey_island"
rm -rf "$HOME/squashfs-root" rm -rf "$HOME/appimage/squashfs-root"
rm -rf "$HOME/git/monkey" rm -rf "$HOME/git/monkey"
rm "$HOME/appimage/Infection_Monkey-x86_64.AppImage" rm "$HOME/appimage/Infection_Monkey-x86_64.AppImage"