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

appimage: set the setting for clrf conversion skip to be used only during appimage build rather than setting a global config value

This commit is contained in:
VakarisZ 2021-07-23 09:51:01 +03:00
parent b12aef7dda
commit 690a535e27
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
appimage/build_appimage.sh
View File

@ -124,8 +124,7 @@ clone_monkey_repo() {
fi fi
log_message "Cloning files from git" log_message "Cloning files from git"
git config --global core.autocrlf false git clone -c core.autocrlf=false --single-branch --recurse-submodules -b "$branch" "$MONKEY_ORIGIN_URL" "$repo_dir" 2>&1 || handle_error
git clone --single-branch --recurse-submodules -b "$branch" "$MONKEY_ORIGIN_URL" "$repo_dir" 2>&1 || handle_error
} }
setup_appdir() { setup_appdir() {
@ -168,7 +167,7 @@ copy_monkey_island_to_appdir() {
cp -r "$1"/common "$INSTALL_DIR/" cp -r "$1"/common "$INSTALL_DIR/"
if ! timeout "${ISLAND_DIR_COPY_TIMEOUT}" cp -r "$1"/monkey_island "$INSTALL_DIR/"; then 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?" log_message "Copying island files takes too long. Maybe you're copying a dev folder instead of a fresh repository?"
exit exit 1
fi fi
cp ./server_config.json.standard "$INSTALL_DIR"/monkey_island/cc/ cp ./server_config.json.standard "$INSTALL_DIR"/monkey_island/cc/