removed a redundancy from buildozer.init

shlomif · Sep 27, 2023 · 0112e83 · 0112e83
1 parent 55d5111
commit 0112e83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ android/*.zip
 android/bin/keystore
 buildozer/.buildozer*
 buildozer/PySolFC-Cardsets*
+buildozer/cardsets
 buildozer/bin
 buildozer/tmp
 buildozer/support*

diff --git a/buildozer/buildozer.init b/buildozer/buildozer.init
@@ -2,8 +2,6 @@
 set -eux
 
 tmpdir=./tmp
-cardsets_dir=PySolFC-Cardsets--Minimal-2.2.0
-cardsets_file=${cardsets_dir}.tar.xz
 
 # NOTE: $1 will be set with fdroid builds only.
 
@@ -31,7 +29,7 @@ echo '### prepare cardsets'
 
 ./mkcards
 
-cp -a ${cardsets_dir}/* ${tmpdir}/data
+cp -a cardsets/* ${tmpdir}/data
 
 echo '### eval version'
 

diff --git a/buildozer/mkcards b/buildozer/mkcards
@@ -4,6 +4,8 @@ set -eux
 cardsets_dir=PySolFC-Cardsets--Minimal-2.2.0
 cardsets_file=${cardsets_dir}.tar.xz
 
+rm -rf cardsets
+
 echo '### prepare cardsets'
 
 if [ ! -f ${cardsets_file} ]; then
@@ -25,4 +27,6 @@ echo '### processing cardsets'
   done
 )
 
+ln -s ${cardsets_dir} cardsets
+
 echo '### end cardsets'