Make directories conform to package name

4 files changed, 14 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cedf23f30858..214068749c50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gog-moo
 	pkgdesc = Master of Orion is a turn-based, 4X science fiction strategy game
 	pkgver = 2.0.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gog.com/game/master_of_orion_1_2
 	arch = any
 	license = custom
@@ -10,10 +10,10 @@ pkgbase = gog-moo
 	options = !strip
 	source = gog_master_of_orion_2.0.0.2.sh::gogdownloader://master_of_orion_classic/en3installer1
 	source = moo
-	source = moo.desktop
+	source = gog-moo.desktop
 	sha512sums = 40565687db81402d731c662e050494344d1c65395fc8c5bfd6c369676a19a66996305a1933994a158c02f78edf4b1e95534f318c854088b7d843cb9454891ae1
-	sha512sums = be7c19eb7a09ff063fb1f941e3c10a65d741d01ee99a53543971f29d5d18be99e43f0f38ccf8381f39f06b6609de4a9404ddab735907320c22a73fa81e37d4c6
-	sha512sums = 8223565f92e51e37eb7f8d43a82d9a9c7edce3bd88611c2e4ece32dc16d15622b90bff8797eb21788e49e390e2abcdc7b33efe3f1e217d43bb56bb525a05cc4a
+	sha512sums = af3d9225016751574bfb5ed9d44768c9da1f53e0d40f882b6e1445264faea91979e9911702f061c41a68464a2e9db89debc75e611ba88b611311f18260320fac
+	sha512sums = 0d24e393dbe87d649f2a19190f70b1b8c78540e837ba855e89cfd39f15268fbd624db6df22c4829a18e45f388a4a25d73bed1a1bd1f57f56bc36309895239ba8
 
 pkgname = gog-moo
 
diff --git a/PKGBUILD b/PKGBUILD
index 6ef8b3b3f4da..1ece0d1b59a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mathias Bastholm <mbastholm at gmail dot com>
 pkgname=gog-moo
 pkgver=2.0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Master of Orion is a turn-based, 4X science fiction strategy game'
 arch=('any')
 url='https://www.gog.com/game/master_of_orion_1_2'
@@ -10,21 +10,21 @@ depends=('dosbox')
 makedepends=('lgogdownloader')
 source=("gog_master_of_orion_${pkgver}.sh::gogdownloader://master_of_orion_classic/en3installer1"
         'moo'
-        'moo.desktop')
+        'gog-moo.desktop')
 DLAGENTS+=('gogdownloader::/usr/bin/lgogdownloader --download-file=%u -o %o')
 options=('!strip')
 sha512sums=('40565687db81402d731c662e050494344d1c65395fc8c5bfd6c369676a19a66996305a1933994a158c02f78edf4b1e95534f318c854088b7d843cb9454891ae1'
-            'be7c19eb7a09ff063fb1f941e3c10a65d741d01ee99a53543971f29d5d18be99e43f0f38ccf8381f39f06b6609de4a9404ddab735907320c22a73fa81e37d4c6'
-            '8223565f92e51e37eb7f8d43a82d9a9c7edce3bd88611c2e4ece32dc16d15622b90bff8797eb21788e49e390e2abcdc7b33efe3f1e217d43bb56bb525a05cc4a')
+            'af3d9225016751574bfb5ed9d44768c9da1f53e0d40f882b6e1445264faea91979e9911702f061c41a68464a2e9db89debc75e611ba88b611311f18260320fac'
+            '0d24e393dbe87d649f2a19190f70b1b8c78540e837ba855e89cfd39f15268fbd624db6df22c4829a18e45f388a4a25d73bed1a1bd1f57f56bc36309895239ba8')
 
 package() {
   install -d -m755 $pkgdir/usr/share
-  cp -r data/noarch/data $pkgdir/usr/share/${pkgname#gog-}
+  cp -r data/noarch/data $pkgdir/usr/share/$pkgname
   find $pkgdir/usr/share -type f -exec chmod 644 "{}" \;
   find $pkgdir/usr/share -type d -exec chmod 755 "{}" \;
 
   install -Dm755 ${pkgname#gog-} $pkgdir/usr/bin/${pkgname#gog-}
-  install -Dm644 data/noarch/support/icon.png $pkgdir/usr/share/icons/hicolor/256x256/apps/${pkgname#gog-}.png
-  install -Dm644 ${pkgname#gog-}.desktop $pkgdir/usr/share/applications/${pkgname#gog-}.desktop
-  install -Dm644 data/noarch/docs/End\ User\ License\ Agreement.txt $pkgdir/usr/share/licenses/${pkgname#gog-}/LICENSE
+  install -Dm644 data/noarch/support/icon.png $pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png
+  install -Dm644 $pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+  install -Dm644 data/noarch/docs/End\ User\ License\ Agreement.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/moo.desktop b/gog-moo.desktop
index fe2faec22214..e9749e9049cd 100644
--- a/moo.desktop
+++ b/gog-moo.desktop
@@ -3,6 +3,6 @@ Type=Application
 Name=Master of Orion
 Path=/usr/bin
 Exec=moo
-Icon=moo
+Icon=gog-moo
 Terminal=false
 Categories=Games;
diff --git a/moo b/moo
index 0002b359e841..1cacf3cc9a3f 100644
--- a/moo
+++ b/moo
@@ -2,7 +2,7 @@
 
 if [ ! -d "$HOME"/.moo ] ; then
     mkdir -p "$HOME"/.moo
-    ln -s /usr/share/moo/* "$HOME"/.moo
+    ln -s /usr/share/gog-moo/* "$HOME"/.moo
 fi
 
 dosbox -c "@echo off" -c "mount c $HOME/.moo/" -c "c:" -c "cls" -c "echo Starting Master of Orion..." -c "orion" -c "exit"