From 2556501525176f0f9faf1cb61b630ec3bda8f4e0 Mon Sep 17 00:00:00 2001
From: neodiX <neodix@ton.org>
Date: Mon, 19 Jun 2023 17:44:21 +0200
Subject: [PATCH 1/5] upgrade with ninja

---
 scripts/upgrade.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 86e46985..9157e7cf 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -28,7 +28,7 @@ done
 COLOR='\033[92m'
 ENDC='\033[0m'
 
-# Установить дополниьтельные зависимости
+# Установить дополнительные зависимости
 apt-get install -y libsecp256k1-dev libsodium-dev
 
 # Go to work dir
@@ -44,12 +44,14 @@ export CXX=/usr/bin/clang++
 export CCACHE_DISABLE=1
 
 # Update binary
-cd ${bindir}/${repo}
-rm -f CMakeCache.txt
+cd ${bindir}
+rm -rf ${repo}
+mkdir ${repo}
+cd ${repo}
 memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
 let "cpuNumber = memory / 2100000" || cpuNumber=1
-cmake -DCMAKE_BUILD_TYPE=Release ${srcdir}/${repo}
-make -j ${cpuNumber} fift validator-engine lite-client pow-miner validator-engine-console generate-random-id dht-server func tonlibjson rldp-http-proxy
+cmake -DCMAKE_BUILD_TYPE=Release ${srcdir}/${repo} -GNinja
+ninja -j ${cpuNumber} fift validator-engine lite-client pow-miner validator-engine-console generate-random-id dht-server func tonlibjson rldp-http-proxy
 systemctl restart validator
 
 # Конец

From ec3a8b9a7dea8d9f96e6bc6d7166f5b278a7f27a Mon Sep 17 00:00:00 2001
From: neodiX <neodix@ton.org>
Date: Mon, 19 Jun 2023 18:55:04 +0200
Subject: [PATCH 2/5] persist global.config.json before the upgrade

---
 scripts/upgrade.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 9157e7cf..5e119291 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -45,9 +45,11 @@ export CCACHE_DISABLE=1
 
 # Update binary
 cd ${bindir}
+cp ${repo}/global.config.json .
 rm -rf ${repo}
 mkdir ${repo}
 cd ${repo}
+cp ../global.config.json .
 memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
 let "cpuNumber = memory / 2100000" || cpuNumber=1
 cmake -DCMAKE_BUILD_TYPE=Release ${srcdir}/${repo} -GNinja

From d51d20ef444022abd0222de71c34cfbf5f260744 Mon Sep 17 00:00:00 2001
From: neodiX <neodix@ton.org>
Date: Mon, 19 Jun 2023 19:04:27 +0200
Subject: [PATCH 3/5] make persistence of global.config.json rights friendly

---
 scripts/upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 5e119291..f99453c4 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -45,11 +45,11 @@ export CCACHE_DISABLE=1
 
 # Update binary
 cd ${bindir}
-cp ${repo}/global.config.json .
+cp ${repo}/global.config.json /tmp
 rm -rf ${repo}
 mkdir ${repo}
 cd ${repo}
-cp ../global.config.json .
+mv /tmp/global.config.json .
 memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
 let "cpuNumber = memory / 2100000" || cpuNumber=1
 cmake -DCMAKE_BUILD_TYPE=Release ${srcdir}/${repo} -GNinja

From b3bc22ea4cc00c0219d7eb975316782911452594 Mon Sep 17 00:00:00 2001
From: neodiX <neodix@ton.org>
Date: Mon, 19 Jun 2023 20:32:34 +0200
Subject: [PATCH 4/5] clean up build directory (without removing it) prior to
 upgrade

---
 scripts/upgrade.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index f99453c4..b8a6e37f 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -44,11 +44,10 @@ export CXX=/usr/bin/clang++
 export CCACHE_DISABLE=1
 
 # Update binary
-cd ${bindir}
-cp ${repo}/global.config.json /tmp
-rm -rf ${repo}
-mkdir ${repo}
-cd ${repo}
+cd ${bindir}/${repo}
+cp global.config.json /tmp
+rm -rf *
+rm -rf .ninja_*
 mv /tmp/global.config.json .
 memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
 let "cpuNumber = memory / 2100000" || cpuNumber=1

From 953e99143f66790dfdaf5541ca0d56f46a345dfc Mon Sep 17 00:00:00 2001
From: neodiX <neodix@ton.org>
Date: Tue, 20 Jun 2023 09:50:14 +0200
Subject: [PATCH 5/5] avoid usage of /tmp dir on clean up

---
 scripts/upgrade.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index b8a6e37f..c8ee3812 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -45,10 +45,8 @@ export CCACHE_DISABLE=1
 
 # Update binary
 cd ${bindir}/${repo}
-cp global.config.json /tmp
-rm -rf *
+ls --hide=global.config.json | xargs -d '\n' rm -rf
 rm -rf .ninja_*
-mv /tmp/global.config.json .
 memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
 let "cpuNumber = memory / 2100000" || cpuNumber=1
 cmake -DCMAKE_BUILD_TYPE=Release ${srcdir}/${repo} -GNinja