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

build: prevent PyInstaller from being installed into the appimage

This commit is contained in:
Mike Salvatore 2021-02-17 15:40:33 -05:00
parent 1ac67cfe54
commit eae5881b5f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment_scripts/appimage/build_appimage.sh
View File

@ -58,7 +58,7 @@ install_build_prereqs() {
sudo apt install -y python3 python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace sudo apt install -y python3 python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace
#monkey island prereqs #monkey island prereqs
sudo apt install -y curl libcurl4 python3.7 python3.7-dev openssl git build-essential sudo apt install -y curl libcurl4 python3.7 python3.7-dev openssl git build-essential moreutils
install_pip_37 install_pip_37
install_nodejs install_nodejs
} }
@ -94,7 +94,7 @@ clone_monkey_repo() {
fi fi
log_message "Cloning files from git" log_message "Cloning files from git"
branch=${2:-"data-dir"} branch=${2:-"local-run-data-dir"}
git clone --single-branch --recurse-submodules -b "$branch" "${MONKEY_GIT_URL}" "${REPO_MONKEY_HOME}" 2>&1 || handle_error git clone --single-branch --recurse-submodules -b "$branch" "${MONKEY_GIT_URL}" "${REPO_MONKEY_HOME}" 2>&1 || handle_error
chmod 774 -R "${MONKEY_HOME}" chmod 774 -R "${MONKEY_HOME}"
@ -116,9 +116,15 @@ copy_monkey_island_to_appdir() {
install_monkey_island_python_dependencies() { install_monkey_island_python_dependencies() {
log_message "Installing island requirements" log_message "Installing island requirements"
requirements_island="$ISLAND_PATH/requirements.txt" requirements_island="$ISLAND_PATH/requirements.txt"
# TODO: This is an ugly hack. PyInstaller is a build-time dependency and should
# not be installed as a runtime requirement.
sed '4d' $requirements_island | sponge $requirements_island
${python_cmd} -m pip install -r "${requirements_island}" --ignore-installed --prefix /usr --root=$APPDIR || handle_error ${python_cmd} -m pip install -r "${requirements_island}" --ignore-installed --prefix /usr --root=$APPDIR || handle_error
${python_cmd} -m pip install pyjwt==1.7 --ignore-installed -U --prefix /usr --root=$APPDIR || handle_error ${python_cmd} -m pip install pyjwt==1.7 --ignore-installed -U --prefix /usr --root=$APPDIR || handle_error
#${python_cmd} -m pip install PyNacl --user --upgrade || handle_error #${python_cmd} -m pip install PyNacl --user --upgrade || handle_error
} }