improve upgrade to 0.99.6.4.r20210908

3 files changed, 38 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3fa6bb50016..9e4a3ab538a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = magicavoxel
 	pkgdesc = A free lightweight 8-bit voxel art editor and GPU based interactive path tracing renderer
 	pkgver = 0.99.6.4.r20210908
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ephtracy.github.io/
 	arch = x86_64
 	license = custom
@@ -14,7 +14,7 @@ pkgbase = magicavoxel
 	source = LICENSE
 	sha512sums = 3108bd6bf8d6c0e1b4255de18e161a2012e656ae943cc2c8dd7dc98c56e32e30552fada293e8dca0a5e648484a984a85e5fbbfb3f03eedc339320b493e5b7a66
 	sha512sums = 6509da8d8b04488b369644fd104cdc820037bc2bd2567d868541562d3096041d29d265cdeb2386ccb66f8f6670b94236d565046bfad92aff9cf7b1988b4af53f
-	sha512sums = 25a7d9302c64e5efa6e57fc9427c43c18345de1680273e64fc9a75270d904a339e420401265265c3d1a09dc7abe4b5dcd76a5949a7baa3e6a0c519de233ec8f5
+	sha512sums = 4e238d1e7745bbea2af228e80fbe20b52aa5684b2204c724db8cdea278f131ad61320f5c72fed106e248f693aac7b820af3cc4b781a0b626674fa1228bc199d7
 	sha512sums = 0872398e0d52df23a4910c3c5257f073f96bbf06db197ebdaf59598ca39d1351c6412598ac46b1eb24ba2a47db8ce7d804d227dc847260c8dbd6213396e816c1
 	sha512sums = feabbff40cef5402aac75d8344acf434079250c25e05c6bc91af705f1254e0010caaf5e64450fee4ec7d4636ec930a5600412bbc3f588149e7ee0cbeefb0e5ae
 
diff --git a/PKGBUILD b/PKGBUILD
index 02ac39278c2f..c583b9296b9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ _plugin_ver='1.2.0'
 
 pkgver="$_pkgver_upstream.r$_pkgver_date$_pkgver_uniqueness"
 
-pkgrel=1
+pkgrel=2
 
 pkgdesc='A free lightweight 8-bit voxel art editor and GPU based interactive path tracing renderer'
 arch=('x86_64')
@@ -42,7 +42,7 @@ depends=(wine)
 makedepends=(icoutils)
 sha512sums=('3108bd6bf8d6c0e1b4255de18e161a2012e656ae943cc2c8dd7dc98c56e32e30552fada293e8dca0a5e648484a984a85e5fbbfb3f03eedc339320b493e5b7a66'
             '6509da8d8b04488b369644fd104cdc820037bc2bd2567d868541562d3096041d29d265cdeb2386ccb66f8f6670b94236d565046bfad92aff9cf7b1988b4af53f'
-            '25a7d9302c64e5efa6e57fc9427c43c18345de1680273e64fc9a75270d904a339e420401265265c3d1a09dc7abe4b5dcd76a5949a7baa3e6a0c519de233ec8f5'
+            '4e238d1e7745bbea2af228e80fbe20b52aa5684b2204c724db8cdea278f131ad61320f5c72fed106e248f693aac7b820af3cc4b781a0b626674fa1228bc199d7'
             '0872398e0d52df23a4910c3c5257f073f96bbf06db197ebdaf59598ca39d1351c6412598ac46b1eb24ba2a47db8ce7d804d227dc847260c8dbd6213396e816c1'
             'feabbff40cef5402aac75d8344acf434079250c25e05c6bc91af705f1254e0010caaf5e64450fee4ec7d4636ec930a5600412bbc3f588149e7ee0cbeefb0e5ae')
 
diff --git a/magicavoxel b/magicavoxel
index 1f9d089bc2c2..8304a5027fd4 100644
--- a/magicavoxel
+++ b/magicavoxel
@@ -2,33 +2,61 @@
 
 set -e
 
+app_folder="$HOME/.magicavoxel"
+app_folder_version_file="$app_folder/version.txt"
+app_folder_current_version=1
+
 export WINEDLLOVERRIDES="mscoree,mshtml="
-export WINEARCH=win64 WINEPREFIX="$HOME/.magicavoxel/wine"
+export WINEARCH=win64
+export WINEPREFIX="$app_folder/wine"
 
 function _link() {
   for path in "$@"
   do
-    ln -s "/usr/share/magicavoxel/$path" "$HOME/.magicavoxel/$path"
+    ln -s "/usr/share/magicavoxel/$path" "$app_folder/$path"
   done
 }
 
 function _copy() {
   for path in "$@"
   do
-    cp -r "/usr/share/magicavoxel/$path" "$HOME/.magicavoxel/$path"
+    cp -r "/usr/share/magicavoxel/$path" "$app_folder/$path"
   done
 }
 
-if [ ! -d "$HOME/.magicavoxel" ] ; then
+version=0
+if [ -f "$app_folder_version_file" ] ; then
+    version=$(cat $app_folder_version_file)
+fi
+
+if [ ! -d "$app_folder" ] ; then
   mkdir -p "$WINEPREFIX"
 
   _link MagicaVoxel.exe
   _link plugin OpenImageDenoise.dll tbb.dll tbbmalloc.dll
-  mkdir "$HOME/.magicavoxel/config"
+  mkdir "$app_folder/config"
   _link config/ui
 
   _copy ibl palette shader cache export vox
   _copy config/config.txt config/hotkey.txt config/dict.txt config/locale.txt config/font
 fi
 
-wine "$HOME/.magicavoxel/MagicaVoxel.exe" "$@"
+if [ "$version" -lt "1" ]; then
+    if [ -L "$app_folder/config/font" ]; then
+        rm "$app_folder/config/font"
+        _copy config/font
+    fi
+
+    if [ ! -f "$app_folder/config/dict.txt" ]; then
+        _copy config/dict.txt
+    fi
+
+    if [ ! -f "$app_folder/config/locale.txt" ]; then
+        _copy config/locale.txt
+    fi
+
+    echo 1 > "$app_folder_version_file"
+fi
+
+wine "$app_folder/MagicaVoxel.exe" "$@"
+