p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1348 from guardicore/appimage_improvements 

appImage improvements
This commit is contained in:
Mike Salvatore 2021-07-23 06:51:04 -04:00 committed by GitHub
parent 3694f584f1 690a535e27
commit 5a703580fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
appimage/build_appimage.sh
View File

@ -19,6 +19,7 @@ NODE_SRC=https://deb.nodesource.com/setup_12.x
APP_TOOL_URL=https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage APP_TOOL_URL=https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage
PYTHON_VERSION="3.7.11" PYTHON_VERSION="3.7.11"
PYTHON_APPIMAGE_URL="https://github.com/niess/python-appimage/releases/download/python3.7/python${PYTHON_VERSION}-cp37-cp37m-manylinux1_x86_64.AppImage" PYTHON_APPIMAGE_URL="https://github.com/niess/python-appimage/releases/download/python3.7/python${PYTHON_VERSION}-cp37-cp37m-manylinux1_x86_64.AppImage"
ISLAND_DIR_COPY_TIMEOUT=60 #Seconds
exit_if_missing_argument() { exit_if_missing_argument() {
if [ -z "$2" ] || [ "${2:0:1}" == "-" ]; then if [ -z "$2" ] || [ "${2:0:1}" == "-" ]; then
@ -123,7 +124,7 @@ clone_monkey_repo() {
fi fi
log_message "Cloning files from git" log_message "Cloning files from git"
git clone --single-branch --recurse-submodules -b "$branch" "$MONKEY_ORIGIN_URL" "$repo_dir" 2>&1 || handle_error git clone -c core.autocrlf=false --single-branch --recurse-submodules -b "$branch" "$MONKEY_ORIGIN_URL" "$repo_dir" 2>&1 || handle_error
} }
setup_appdir() { setup_appdir() {
@ -164,7 +165,10 @@ copy_monkey_island_to_appdir() {
cp "$1"/__init__.py "$INSTALL_DIR" cp "$1"/__init__.py "$INSTALL_DIR"
cp "$1"/monkey_island.py "$INSTALL_DIR" cp "$1"/monkey_island.py "$INSTALL_DIR"
cp -r "$1"/common "$INSTALL_DIR/" cp -r "$1"/common "$INSTALL_DIR/"
cp -r "$1"/monkey_island "$INSTALL_DIR/" if ! timeout "${ISLAND_DIR_COPY_TIMEOUT}" cp -r "$1"/monkey_island "$INSTALL_DIR/"; then
log_message "Copying island files takes too long. Maybe you're copying a dev folder instead of a fresh repository?"
exit 1
fi
cp ./server_config.json.standard "$INSTALL_DIR"/monkey_island/cc/ cp ./server_config.json.standard "$INSTALL_DIR"/monkey_island/cc/
# TODO: This is a workaround that may be able to be removed after PR #848 is # TODO: This is a workaround that may be able to be removed after PR #848 is