From 690a535e2767c6d8491faa3af52b093fff71fb0a Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Fri, 23 Jul 2021 09:51:01 +0300
Subject: [PATCH] appimage: set the setting for clrf conversion skip to be used
 only during appimage build rather than setting a global config value

---
 appimage/build_appimage.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index e18796a1b..5ed46dfea 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -124,8 +124,7 @@ clone_monkey_repo() {
   fi
 
   log_message "Cloning files from git"
-  git config --global core.autocrlf false
-  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() {
@@ -168,7 +167,7 @@ copy_monkey_island_to_appdir() {
   cp -r "$1"/common "$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
+    exit 1
   fi
   cp ./server_config.json.standard "$INSTALL_DIR"/monkey_island/cc/