From 0b940b76f6f69cc5521d4a6b829146e2b22ba44d Mon Sep 17 00:00:00 2001
From: sulincix <parduscix@yandex.ru>
Date: Wed, 9 Nov 2022 21:32:22 +0000
Subject: [PATCH] script update

---
 buildall.sh | 13 +++++++++----
 update.sh   | 11 +++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/buildall.sh b/buildall.sh
index 90c3307b..5d5da770 100644
--- a/buildall.sh
+++ b/buildall.sh
@@ -1,16 +1,21 @@
 #!/bin/bash
 set -e
+move_package(){
+    mkdir -p output
+    find -type f  | grep -v "output"| grep "$(uname -m).ymp$" | sort -V | while read line ; do
+        mv $line output
+    done
+}
+
 find -type f | grep ympbuild | sort -V | while read line ; do
     name=$(basename $(dirname $line))
     path=$(realpath $(dirname $line))
     if ! find ./output/ -type f | grep "${name}_" | grep "$(uname -m).ymp$" 2>/dev/null ; then
         echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line"
         ymp --sandbox --shared="$path" build "$path" --verbose --no-source --ignore-dependency --allow-oem
+        move_package
         echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line"
     fi
 done
-mkdir -p output
-find -type f  | grep -v "output"| grep "$(uname -m).ymp$" | sort -V | while read line ; do
-    mv $line output
-done
+
 ymp index output --allow-oem --verbose --move
diff --git a/update.sh b/update.sh
index 64278923..18e093ba 100644
--- a/update.sh
+++ b/update.sh
@@ -1,17 +1,20 @@
 #!/bin/bash
 set -e
+move_source(){
+    mkdir -p output
+    find -type f  | grep -v "output"| grep "source.ymp$" | sort -V | while read line ; do
+        mv $line output
+    done
+}
 find -type f | grep ympbuild | sort -V | while read line ; do
     name=$(basename $(dirname $line))
     path=$(realpath $(dirname $line))
     if ! find ./output/ -type f | grep "${name}_" | grep "source.ymp$" 2>/dev/null ; then
         echo -e "\033[33;1m=>> SOURCE BUILD START:\033[;0m $line"
         ymp --sandbox --shared="$path" build "$path" --verbose --no-binary --ignore-dependency --allow-oem
+        move_source
         echo -e "\033[33;1m<<= SOURCE BUILD DONE:\033[;0m $line"
     fi
 done
-mkdir -p output
-find -type f  | grep -v "output"| grep "source.ymp$" | sort -V | while read line ; do
-    mv $line output
-done
 ymp index output --allow-oem --verbose --move