From 82e640cef59e848ed50f2c58882133a19ca7a2ff Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Thu, 20 Aug 2020 00:21:30 +0200
Subject: [PATCH] Update build.sh and install_dependencies.sh

---
 travis/build.sh                | 6 ++----
 travis/install_dependencies.sh | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/travis/build.sh b/travis/build.sh
index 191e87b..884c122 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -9,14 +9,13 @@ source ./travis/setup_variables.sh
 cd $TD_BUILD_DIR
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
   cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR}
-  # Prepare for split-sources
-  cmake --build $TD_BUILD_DIR --target prepare_cross_compiling -- -j${TRAVIS_CPU_CORES}
 elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
   cmake -A x64 -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake ${TD_SRC_DIR}
 fi
 
   # Split sources
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+  cmake --build $TD_BUILD_DIR --target prepare_cross_compiling -- -j${TRAVIS_CPU_CORES}
   cd $TD_SRC_DIR
   php SplitSource.php
 fi
@@ -29,8 +28,7 @@ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
   cmake --build $TD_BUILD_DIR --target install --config Release -- -m
 fi
 
-# After build
-  # Undo split-sources
+# Undo split-sources
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
   cd $TD_SRC_DIR
   php SplitSource.php --undo
diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh
index b635c2c..5c1d6e6 100755
--- a/travis/install_dependencies.sh
+++ b/travis/install_dependencies.sh
@@ -16,11 +16,11 @@ source ./travis/setup_variables.sh
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
   echo "Linux"
   if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then
-    fallocate l- 4G /myswap.img
-    mkswap swap.img
-    chmod 0600 myswap.img
+    sudo fallocate -l 4G /myswap.img
+    sudo mkswap swap.img
+    sudo chmod 0600 myswap.img
     sudo chown root:root /myswap.img
-    swapon swap.img
+    sudo swapon swap.img
   fi
 elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
   echo "Windows"