Fixed caching issue, and the versioning changing back to the original form

3 files changed, 22 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df9de1067ff0..104fc2a2612a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = onehouronelife-latest
 	pkgdesc = One Hour One Life game by Jason Rohrer. Builds the latest release tagged on github
-	pkgver = 194.d_0ab301c4.o_89af19a8.m_1f584d6
+	pkgver = 198.d_05ab09d6.o_63907416.m_8b11922
 	pkgrel = 1
 	url = http://onehouronelife.com
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 196f59ae3e07..64afc6190c90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: bobpaul <aurpackage [at] bobpaul 'period' org>
 
 pkgname="onehouronelife-latest"
-pkgver=194.d_0ab301c4.o_89af19a8.m_1f584d6
+pkgver=198.d_05ab09d6.o_63907416.m_8b11922
 pkgrel=1
 epoch=
 pkgdesc="One Hour One Life game by Jason Rohrer. Builds the latest release tagged on github"
@@ -71,7 +71,7 @@ prepare() {
         git checkout -q ${_orev}
     else
         echo Checkout out OneLife_v$latestTaggedVersionA from OneLife repo
-        git checkout -q $latestTaggedVersionA
+        git checkout -q OneLife_v$latestTaggedVersionA
     fi
     _latestTaggedRevs=$(echo "${_latestTaggedRevs}.o_$(git rev-parse --short HEAD)")
     cd ..
@@ -86,7 +86,7 @@ prepare() {
         git checkout -q ${_mrev}
     else
         echo Checkout out OneLife_v$latestTaggedVersion from minorGems repo
-        git checkout -q $latestTaggedVersion
+        git checkout -q OneLife_v$latestTaggedVersion
     fi
     _latestTaggedRevs=$(echo "${_latestTaggedRevs}.m_$(git rev-parse --short HEAD)")
     cd ..
@@ -130,26 +130,26 @@ package() {
     install -Dm644 OneLife/no_copyright.txt                      "$pkgdir/usr/share/licenses/$instdir/LICENSE"
     install -Dm644 dataVersionNumber.txt                         "$pkgdir/usr/share/licenses/$instdir/"
     install -Dm755 OneLife/gameSource/OneLife                    "$pkgdir/opt/$instdir/OneLifeApp"
-    install -dm755 "$pkgdir/opt/$instdir/animations"
-    install -dm755 "$pkgdir/opt/$instdir/categories"
+    install -dm777 "$pkgdir/opt/$instdir/animations"
+    install -dm777 "$pkgdir/opt/$instdir/categories"
     install -dm755 "$pkgdir/opt/$instdir/graphics"
     install -dm755 "$pkgdir/opt/$instdir/ground"
     install -dm755 "$pkgdir/opt/$instdir/languages"
     install -dm755 "$pkgdir/opt/$instdir/music"
-    install -dm755 "$pkgdir/opt/$instdir/objects"
+    install -dm777 "$pkgdir/opt/$instdir/objects"
     install -dm755 "$pkgdir/opt/$instdir/otherSounds"
     install -dm755 "$pkgdir/opt/$instdir/settings_default"
     install -dm755 "$pkgdir/opt/$instdir/sounds"
-    install -dm755 "$pkgdir/opt/$instdir/sprites"
-    install -dm755 "$pkgdir/opt/$instdir/transitions"
-    install -Dm755 animations/*                                  "$pkgdir/opt/$instdir/animations"
-    install -Dm755 categories/*                                  "$pkgdir/opt/$instdir/categories"
+    install -dm777 "$pkgdir/opt/$instdir/sprites"
+    install -dm777 "$pkgdir/opt/$instdir/transitions"
+    install -Dm777 animations/*                                  "$pkgdir/opt/$instdir/animations"
+    install -Dm777 categories/*                                  "$pkgdir/opt/$instdir/categories"
     install -Dm755 ground/*                                      "$pkgdir/opt/$instdir/ground"
     install -Dm755 music/*                                       "$pkgdir/opt/$instdir/music"
-    install -Dm755 objects/*                                     "$pkgdir/opt/$instdir/objects"
+    install -Dm777 objects/*                                     "$pkgdir/opt/$instdir/objects"
     install -Dm755 sounds/*                                      "$pkgdir/opt/$instdir/sounds"
-    install -Dm755 sprites/*                                     "$pkgdir/opt/$instdir/sprites"
-    install -Dm755 transitions/*                                 "$pkgdir/opt/$instdir/transitions"
+    install -Dm777 sprites/*                                     "$pkgdir/opt/$instdir/sprites"
+    install -Dm777 transitions/*                                 "$pkgdir/opt/$instdir/transitions"
     install -Dm755 OneLife/gameSource/graphics/*                 "$pkgdir/opt/$instdir/graphics"
     install -Dm755 OneLife/gameSource/otherSounds/*              "$pkgdir/opt/$instdir/otherSounds"
     install -Dm755 OneLife/gameSource/settings/*                 "$pkgdir/opt/$instdir/settings_default"
@@ -161,4 +161,5 @@ package() {
     install -dm755 "$pkgdir/usr/local/bin/"
     install -m755  $startdir/onelife $pkgdir/opt/$instdir
     ln -s /opt/$instdir/onelife $pkgdir/usr/local/bin/onelife
+
 }
diff --git a/onelife b/onelife
index a0882f956adb..1ab7c9a6e882 100755
--- a/onelife
+++ b/onelife
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# Originally, this script was used to copy the cache directories to .config/onelife
+# However, the cache directories changed, and now would require copying most of the game
+# data to .config/onelife. I (hopefully) temporarily changed the permissons on the 
+# directories the cache files are stored in
+# This script is mainly kept because it stores the settings in a user-writable area
+
+
 if readlink $0 > /dev/null; then
    DIR=$(dirname $(readlink $0))
 else
@@ -10,9 +17,6 @@ if ! [[ -d ~/.config/onelife/settings ]]; then
    mkdir -p ~/.config/onelife/settings >/dev/null || true
 fi
 
-## writeable stuff
-#copy cache directories so we don't have to build from scratch
-cp -rn /opt/onehouronelife/*Cache ~/.config/onelife/
 #copy settings directory
 cp -n /opt/onehouronelife/settings_default/* ~/.config/onelife/settings/