diff --git a/.appveyor.yml b/.appveyor.yml index 80697a48..cce3f259 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,9 +35,9 @@ test_script: - gmake mo - pyinstaller pysol.py --windowed --icon=data\pysol.ico - python3 setup.py install_data -d dist\pysol - - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.1.tar.xz/download -FileName cardsets.tar.xz + - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.2.tar.xz/download -FileName cardsets.tar.xz - 7z x cardsets.tar.xz -so | 7z x -si -ttar - - mv PySolFC-Cardsets--Minimal-2.0.1/cardset-* dist/pysol/data + - mv PySolFC-Cardsets--Minimal-2.0.2/cardset-* dist/pysol/data - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz/download -FileName music.tar.xz - 7z x music.tar.xz -so | 7z x -si -ttar - move pysol-music-4.50\data\music dist\pysol\data\music diff --git a/android/mkp4a.clean b/android/mkp4a.clean index c558eaef..fe352bd7 100755 --- a/android/mkp4a.clean +++ b/android/mkp4a.clean @@ -5,4 +5,4 @@ rm -rf tmp python3 -m pythonforandroid.toolchain clean_dists python3 -m pythonforandroid.toolchain clean_builds rm -f *.apk -rm -rf PySolFC-Cardsets--Minimal-2.0.1 +rm -rf PySolFC-Cardsets--Minimal-2.0.2 diff --git a/android/mkp4a.common b/android/mkp4a.common index 3845d84c..436bb9dc 100644 --- a/android/mkp4a.common +++ b/android/mkp4a.common @@ -5,7 +5,7 @@ version=$(PYTHONPATH=.. python3 -c \ tmpdir=${HOME}/.cache/tmp-for-p4a/pysolfc/src -cardsets_dir='PySolFC-Cardsets--Minimal-2.0.1' +cardsets_dir='PySolFC-Cardsets--Minimal-2.0.2' cardsets_file="${cardsets_dir}.tar.xz" p4aver="2019.10.6" diff --git a/scripts/repack-min-cardsets.bash b/scripts/repack-min-cardsets.bash index f73a0f66..e58d0bcb 100755 --- a/scripts/repack-min-cardsets.bash +++ b/scripts/repack-min-cardsets.bash @@ -10,9 +10,9 @@ set -e -x src_base="PySolFC-Cardsets" dest_base="$src_base--Minimal" -ver="2.0.1" +ver="2.0.2" src_vbase="$src_base-2.0" -dest_vbase="$dest_base-2.0.1" +dest_vbase="$dest_base-2.0.2" src_arc="$src_vbase.tar.bz2" if ! test -f "$src_arc"