Adopted and re-uploaded

2 files changed, 50 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4bbcd0c285d..f6b1c2c0bad7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
+# Generated by mksrcinfo v8
+# Sat Feb  2 14:52:35 UTC 2019
 pkgbase = the-incredible-machine-2
 	pkgdesc = A classic puzzle game from Abandonia, played in DosBox.
 	pkgver = 1.0
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.abandonia.com/en/games/395/Incredible+Machine+2,+The.html
-	install = tim2.install
 	arch = any
 	license = custom-freeware
 	license = Abandonware
 	depends = dosbox
 	depends = unionfs-fuse
-	optdepends = abandonia-menu
 	source = The_Incredible_Machine_2.zip::http://files.abandonia.com/download.php?game=Incredible+Machine+2%2C+The&secure=98ddb7b4cd755918180065de92319f8f&td=1297665430
 	source = TIM2.png
-	md5sums = b0e1b4e0f7000a49ef9bb2920ab288a4
-	md5sums = cd42b0e995ef697377ef8e05fd7092b5
+	sha256sums = 560b0db9d9d10a2aad14b9c3ea22676efe2ac377b41b12df3ae0b4f1a202c21c
+	sha256sums = 8eaaf9611c9ef77105288be1190b176e04beab6d0513f39dfa5a06dadb0e2ace
 
 pkgname = the-incredible-machine-2
 
diff --git a/PKGBUILD b/PKGBUILD
index 92ad77be69b9..f169446f5133 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,59 @@
+# Maintainer:  twa022 <twa022 at gmail dot com>
+# Contributor: Mark Coolen
 # Contributor: Jens Staal <staal1978@gmail.com>
 # Contributor: Mark Coolen <mark d_t coolen _t gmail d_t com>
-# Maintainer: Mark Coolen
 
+_pkgname="TIM2"
 pkgname="the-incredible-machine-2"
 pkgver="1.0"
-pkgrel=5
+pkgrel=6
 pkgdesc="A classic puzzle game from Abandonia, played in DosBox."
 url='http://www.abandonia.com/en/games/395/Incredible+Machine+2,+The.html'
 arch=('any')
 license=('custom-freeware' 'Abandonware')
-install='tim2.install'
 depends=('dosbox' 'unionfs-fuse')
-optdepends=('abandonia-menu')
 source=('The_Incredible_Machine_2.zip::http://files.abandonia.com/download.php?game=Incredible+Machine+2%2C+The&secure=98ddb7b4cd755918180065de92319f8f&td=1297665430' 'TIM2.png')
-md5sums=('b0e1b4e0f7000a49ef9bb2920ab288a4' 'cd42b0e995ef697377ef8e05fd7092b5')
-_pkgabbrev="TIM2"
-_exe="TIM2.EXE"
-_icon="TIM2.png"
+sha256sums=('560b0db9d9d10a2aad14b9c3ea22676efe2ac377b41b12df3ae0b4f1a202c21c'
+            '8eaaf9611c9ef77105288be1190b176e04beab6d0513f39dfa5a06dadb0e2ace')
 
 package() {
-
-	mkdir -p -m755 "$pkgdir/opt/" 
-	mkdir -p -m755 "$pkgdir/opt/abandonia" 
-	mkdir -p -m755 "$pkgdir/opt/abandonia/$_pkgabbrev" 
-	rm -f $srcdir/download* 
-	cp -ar $srcdir/the\ incredible\ machine\ 2/* "$pkgdir/opt/abandonia/$_pkgabbrev" 
-
-	#ok, let's use a script to start the game
-
-	mkdir -p -m755 $pkgdir/usr/bin/ 
-	printf "#!/bin/sh
-if whereis unionfs-fuse>/dev/null 2>&1;
-    then
-	if whereis dosbox>/dev/null 2>&1;
-		then
-			mkdir -p ~/.abandonia/$_pkgabbrev/temp
-			mkdir -p ~/.abandonia/$_pkgabbrev/persistent
-			unionfs -o cow -o umask=000 ~/.abandonia/$_pkgabbrev/persistent=RW:/opt/abandonia/$_pkgabbrev=RO ~/.abandonia/$_pkgabbrev/temp
-			dosbox ~/.abandonia/$_pkgabbrev/temp/$_exe
-			fusermount -u ~/.abandonia/$_pkgabbrev/temp			
-		else
-			echo '==> Please be sure to have dosbox installed and in your PATH.'
-	fi
-    else
- 	echo '==> Please be sure to have unionfs-fuse installed and in your PATH.'
-fi" >> $pkgdir/usr/bin/$_pkgabbrev.sh 
-	chmod +x $pkgdir/usr/bin/$_pkgabbrev.sh 
-	ln -s $_pkgabbrev.sh /$pkgdir/usr/bin/$_pkgabbrev 
-
-	# Automatic generation of a .desktop file
-
-	mkdir -p -m755 "$pkgdir/usr/share/applications/" 
-
-	printf "[Desktop Entry]
-Version=$pkgver
-Type=Application
-Name=$pkgname
-Comment=$pkgdesc
-Exec=/usr/bin/$_pkgabbrev
-Icon=/opt/abandonia/$_pkgabbrev/$_icon
-Categories=Game;Abandonia;
-Terminal=false
-StartupNotify=false" >> $pkgdir/usr/share/applications/$_pkgabbrev.desktop
+	install -d -m755 "${pkgdir}/opt/abandonia/${_pkgname}"
+	cp -ar "${srcdir}/the incredible machine 2"/* "${pkgdir}/opt/abandonia/${_pkgname}" 
+	# Install the icon to pixmaps directory
+	install -D -m644 "${srcdir}"/TIM2.png "${pkgdir}"/usr/share/pixmaps/TIM2.png
+
+	# Create a script to start the game
+	install -d -m755 "${pkgdir}"/usr/bin/ 
+	cat <<- __EOF__ > "${pkgdir}/usr/bin/${_pkgname}"
+		#!/bin/sh
+		if whereis unionfs-fuse>/dev/null 2>&1 ; then
+			if whereis dosbox>/dev/null 2>&1 ; then
+				mkdir -p ~/.abandonia/${_pkgname}/temp
+				mkdir -p ~/.abandonia/${_pkgname}/persistent
+				unionfs -o cow -o umask=000 ~/.abandonia/${_pkgname}/persistent=RW:/opt/abandonia/${_pkgname}=RO ~/.abandonia/${_pkgname}/temp
+				dosbox ~/.abandonia/${_pkgname}/temp/TIM2.EXE
+				fusermount -u ~/.abandonia/${_pkgname}/temp
+			else
+				echo '==> Please be sure to have dosbox installed and in your PATH.'
+			fi
+    	else
+ 			echo '==> Please be sure to have unionfs-fuse installed and in your PATH.'
+		fi
+	__EOF__
+	chmod +x "${pkgdir}/usr/bin/${_pkgname}"
+
+	# Create a .desktop file
+	install -d -m755 "$pkgdir/usr/share/applications/" 
+	cat <<- __EOF__ > "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+		[Desktop Entry]
+		Version=1.0
+		Type=Application
+		Name=${pkgname}
+		Comment=${pkgdesc}
+		Exec=/usr/bin/${_pkgname}
+		Icon=${_pkgname}
+		Categories=Game;
+		Terminal=false
+		StartupNotify=false
+	__EOF__
 }