changed install location to /opt

4 files changed, 33 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ab119d1311c..2bbc9b87f85c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freeablo
 	pkgdesc = Modern, FLOSS reimplementation of the Diablo 1 game engine
 	pkgver = 0.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://freeablo.org/
 	install = freeablo.install
 	arch = x86_64
@@ -16,9 +16,11 @@ pkgbase = freeablo
 	depends = qt5-base
 	source = https://github.com/wheybags/freeablo/archive/refs/tags/v0.4.tar.gz
 	source = freeablo.patch
+	source = freeablo.sh
 	source = https://github.com/wheybags/freeablo/pull/504/commits/ae952ca143aa0313b2f9018dc33f7f07047fad0a.patch
 	sha256sums = 322a06bebf6c522ebac1195f48962abd330050f447ea3a9ee977cd2d60b1258f
 	sha256sums = bbff90626c0dbe278b2c39553ee307a66e3a1c5645454046c687b45f0d8ef78f
+	sha256sums = 40aaf73217ed11ac511d42ac26161a6b99a01e19e7c7d5dbd5095539c0239c7d
 	sha256sums = a8b6601d684a0ed6697a3eedb50889645c5557911b7a137767eef830944cb469
 
 pkgname = freeablo
diff --git a/PKGBUILD b/PKGBUILD
index a0dda5416549..2d43be8309b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=freeablo
 pkgver=0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Modern, FLOSS reimplementation of the Diablo 1 game engine"
 arch=(x86_64)
 url="https://freeablo.org/"
@@ -14,9 +14,11 @@ makedepends=(cmake)
 install=freeablo.install
 source=("https://github.com/wheybags/freeablo/archive/refs/tags/v${pkgver}.tar.gz"
 		"freeablo.patch"
+		"freeablo.sh"
         "https://github.com/wheybags/freeablo/pull/504/commits/ae952ca143aa0313b2f9018dc33f7f07047fad0a.patch")
 sha256sums=('322a06bebf6c522ebac1195f48962abd330050f447ea3a9ee977cd2d60b1258f'
             'bbff90626c0dbe278b2c39553ee307a66e3a1c5645454046c687b45f0d8ef78f'
+            '40aaf73217ed11ac511d42ac26161a6b99a01e19e7c7d5dbd5095539c0239c7d'
             'a8b6601d684a0ed6697a3eedb50889645c5557911b7a137767eef830944cb469')
 
 
@@ -37,7 +39,7 @@ build() {
     -DVIDEO_WAYLAND:BOOL=OFF \
     -DVIDEO_WAYLAND_QT_TOUCH:BOOL=OFF \
     -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX="/opt/${pkgname}"
 
   make
 }
@@ -45,11 +47,17 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR=${pkgdir} install
-  install -Dm644 ../readme.md "${pkgdir}/usr/share/doc/freeablo/readme.md"
+  install -Dm644 ../readme.md "${pkgdir}/opt/"${pkgname}"/readme.md"
+  cd "${pkgdir}/opt/${pkgname}"
+#  mv "${pkgname}/changelog.md" .
+#  rmdir "${pkgname}"
+  mv bin/* .
+  rmdir bin
+  chmod -R 777 resources
+  cd ..
+  chmod 777 "${pkgname}"
 
-  install -D "${srcdir}/${pkgname}-${pkgver}/resources/launcher/play.png" "${pkgdir}/usr/share/pixmaps/freeablo.png"
-  cd "${pkgdir}/usr"
-  pwd
-  mkdir -p "share/${pkgname}"
-  mv resources "share/${pkgname}/"
+#  install -D "${srcdir}/${pkgname}-${pkgver}/resources/launcher/play.png" "${pkgdir}/usr/share/pixmaps/freeablo.png"
+  mkdir -p "${pkgdir}/usr/bin"
+  install "${srcdir}/freeablo.sh" "${pkgdir}/usr/bin/freeablo"
   }
diff --git a/freeablo.install b/freeablo.install
index 5aa5bbc24c6a..2b242f986ff7 100644
--- a/freeablo.install
+++ b/freeablo.install
@@ -1,13 +1,12 @@
 post_install() {
   echo "Additional setup is needed, as freeablo only searches for resources in the"
   echo "current directory:"
-  echo "$ mkdir -p ~/.freeablo ; cp -rup /usr/share/freeablo/resources ~/.freeablo"
-  echo "You also need to put the files 'DIABDAT.MPQ' and 'Diablo.exe' there."
+  echo "You will need to put the files 'DIABDAT.MPQ' and 'Diablo.exe'"
+  echo "in /opt/freeablo."
   echo ""
-  echo "To launch it, use this:"
-  echo "$ cd ~/.freeablo && freeablo"
+  echo "This will not work well on multi-user systems. I need to"
+  echo "figure out how to allow multiple users to use multiple save files"
 }
-# TODO: move to /opt and replace /usr/bin/freeable with a shell script
 post_upgrade() {
   post_install
 }
diff --git a/freeablo.sh b/freeablo.sh
new file mode 100755
index 000000000000..93fb4ec063b0
--- /dev/null
+++ b/freeablo.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+cd /opt/freeablo
+
+if [ -f "Diablo.exe" ] && [ -f "DIABDAT.MPQ" ]; then
+	./freeablo
+else
+	printf "Diablo.exe and/or DIABDAT.MPQ are not present.\nPlease put a copy of Diablo.exe and DIABDAT.MPQ in /opt/freeablo."
+fi
+# I don't think this program was ever designed to be installed in anything but your home dir