diff --git a/appimage/AppRun b/appimage/AppRun index 1a39dddb6..47f17a778 100755 --- a/appimage/AppRun +++ b/appimage/AppRun @@ -25,5 +25,5 @@ do fi done -(PYTHONHOME="${APPDIR}/opt/python3.7" exec "/bin/bash" "${APPDIR}/usr/src/monkey_island/linux/run_appimage.sh") +(PYTHONHOME="${APPDIR}/opt/python3.7" exec "${APPDIR}/opt/python3.7/bin/python3.7" "${APPDIR}/usr/src/monkey_island.py" $@) exit "$?" diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh index bce51bc89..cbc1eec93 100755 --- a/appimage/build_appimage.sh +++ b/appimage/build_appimage.sh @@ -165,7 +165,6 @@ copy_monkey_island_to_appdir() { cp "$1"/monkey_island.py "$INSTALL_DIR" cp -r "$1"/common "$INSTALL_DIR/" cp -r "$1"/monkey_island "$INSTALL_DIR/" - cp ./run_appimage.sh "$INSTALL_DIR"/monkey_island/linux/ 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 diff --git a/appimage/run_appimage.sh b/appimage/run_appimage.sh deleted file mode 100644 index d31b41843..000000000 --- a/appimage/run_appimage.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -PYTHON_CMD="$APPDIR"/opt/python3.7/bin/python3.7 -DOT_MONKEY="$HOME"/.monkey_island/ - -# shellcheck disable=SC2174 -mkdir --mode=0700 --parents "$DOT_MONKEY" - -DB_DIR="$DOT_MONKEY"/db -mkdir --parents "$DB_DIR" - -cd "$APPDIR"/usr/src || exit 1 -./monkey_island/bin/mongodb/bin/mongod --dbpath "$DB_DIR" & -${PYTHON_CMD} ./monkey_island.py --server-config "$DOT_MONKEY"/server_config.json