From 39347dea58c418f060e13f920ed0dd9861dcdd5f Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 6 Jun 2020 20:59:12 -0300
Subject: Update script: Use only "previous" commit hash. This will lower the
 passive HD usage in ~/.local

---
 update/pseudo_update.sh |  8 ++++----
 update/update.sh        | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'update')

diff --git a/update/pseudo_update.sh b/update/pseudo_update.sh
index 49ae5c9..3b5ad51 100755
--- a/update/pseudo_update.sh
+++ b/update/pseudo_update.sh
@@ -13,17 +13,17 @@ u1=`echo ${previous} | cut -c 1-7`
 u2=`echo ${head} | cut -c 1-7`
 git diff --name-status ${previous} HEAD | awk '/^(A|M)\t/ {print $2}; /^(R...)\t/ {print $3}' | \
 grep -e "[.]\(xml\|png\|tmx\|ogg\|txt\|po\|tsx\)" | sort | uniq | \
-xargs zip -X -9 -r ../tools/update/upload/Bugfix-${u1}..${u2}.zip
+xargs zip -X -9 -r ../tools/update/upload/Bugfix-${u1}.zip
 
 cd $dir/upload
 
-sum=`adler32 Bugfix-${u1}..${u2}.zip | awk '{print $2}'`
+sum=`adler32 Bugfix-${u1}.zip | awk '{print $2}'`
 echo "Update ID: ${u1}..${u2}"
 echo "Checksum: ${sum}"
 
-echo "Bugfix-${u1}..${u2}.zip ${sum}" >>resources2.txt
+echo "Bugfix-${u1}.zip ${sum}" >>resources2.txt
 cp ../files/xml_header.txt resources.xml
-echo "    <update type=\"data\" file=\"Bugfix-${u1}..${u2}.zip\" hash=\"${sum}\" />" >> resources.xml
+echo "    <update type=\"data\" file=\"Bugfix-${u1}.zip\" hash=\"${sum}\" />" >> resources.xml
 cat ../files/xml_footer.txt >>resources.xml
 cat ../files/xml_mods.txt >>resources.xml
 echo '</updates>' >>resources.xml
diff --git a/update/update.sh b/update/update.sh
index d0b996f..4a01732 100755
--- a/update/update.sh
+++ b/update/update.sh
@@ -19,21 +19,21 @@ u1=`echo ${previous} | cut -c 1-7`
 u2=`echo ${head} | cut -c 1-7`
 git diff --name-status ${previous} HEAD | awk '/^(A|M)\t/ {print $2}; /^(R...)\t/ {print $3}' | \
     grep -e "[.]\(xml\|png\|tmx\|ogg\|txt\|po\|tsx\)" | sort | uniq | \
-    xargs zip -X -9 -r ../tools/update/files/TMW2-${u1}..${u2}.zip
+    xargs zip -X -9 -r ../tools/update/files/TMW2-${u1}.zip
 
 cd $dir/files
-if [ -f TMW2-${u1}..${u2}.zip ]; then
+if [ -f TMW2-${u1}.zip ]; then
     mv ../commit.txt ../commit_old.txt
     echo ${head} >../commit.txt
-    sum=`adler32 TMW2-${u1}..${u2}.zip | awk '{print $2}'`
-    echo "TMW2-${u1}..${u2}.zip ${sum}" >>resources2.txt
-    echo "    <update type=\"data\" file=\"TMW2-${u1}..${u2}.zip\" hash=\"${sum}\" />" >> xml_header.txt
+    sum=`adler32 TMW2-${u1}.zip | awk '{print $2}'`
+    echo "TMW2-${u1}.zip ${sum}" >>resources2.txt
+    echo "    <update type=\"data\" file=\"TMW2-${u1}.zip\" hash=\"${sum}\" />" >> xml_header.txt
     cp xml_header.txt resources.xml
     cat xml_footer.txt >>resources.xml
     cat xml_mods.txt >>resources.xml
     echo '</updates>' >>resources.xml
 
-    cp TMW2-${u1}..${u2}.zip ../upload/
+    cp TMW2-${u1}.zip ../upload/
     cp resources2.txt ../upload/
     cp resources.xml ../upload/
     cp ../news.txt ../upload
-- 
cgit v1.2.3-60-g2f50