Fixed Building

5 files changed, 26 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ade2b9df5807..02ba1f61d826 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = serioussam
-	pkgdesc = Serious Sam Classic native Linux version with XPLUS Modification.
+	pkgdesc = Serious Sam Classic native Linux version with XPLUS Modificatio
 	pkgver = 1.10.2
 	pkgrel = 2
 	url = https://github.com/tx00100xt/SeriousSamClassic
diff --git a/.gitignore b/.gitignore
index b35ba86d8ebc..1c6bee54d005 100644..100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,5 @@
 !serioussam.xpm
 !serioussam-tfe.sh
 !serioussam-tse.sh
-!serioussam-tfe.desktop
+!serioussam-tse.desktop
 !serioussam-tse.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 8ebc6e5f5780..b656e97a6559 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ makedepends=('cmake' 'make' 'sed')
 replaces=('serioussam-vk')
 install=serioussam.install
 source=("https://github.com/tx00100xt/SeriousSamClassic/archive/refs/tags/v$pkgver.tar.gz"
-	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTFE-XPLUS/SamTFE-XPLUS.tar.xz.partaa"
+    "https://github.com/tx00100xt/serioussam-mods/raw/main/SamTFE-XPLUS/SamTFE-XPLUS.tar.xz.partaa"
 	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTFE-XPLUS/SamTFE-XPLUS.tar.xz.partab"
 	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTFE-XPLUS/SamTFE-XPLUS.tar.xz.partac"
 	"https://github.com/tx00100xt/serioussam-mods/raw/main/SamTSE-XPLUS/SamTSE-XPLUS.tar.xz.partaa"
@@ -26,8 +26,14 @@ source=("https://github.com/tx00100xt/SeriousSamClassic/archive/refs/tags/v$pkgv
     "serioussam-tfe.desktop"
     "serioussam-tse.desktop"
     "serioussam.xpm"
-    "serioussam-tfe.sh")
+    "serioussam-tfe.sh"
     "serioussam-tse.sh")
+noextract=("SamTFE-XPLUS.tar.xz.partaa"
+	"SamTFE-XPLUS.tar.xz.partab"
+	"SamTFE-XPLUS.tar.xz.partac"
+	"SamTSE-XPLUS.tar.xz.partaa"
+	"SamTSE-XPLUS.tar.xz.partab"
+	"SamTSE-XPLUS.tar.xz.partac")
 sha256sums=('e59880dfe320c5a97c5adc59980c66ef8bd1bbac4ddb1d02fa03221d31f8654d'
             '01b2e2d4dbdb65b2f1e174fbd6606d70806e97b6a45047ed6c58e7b801f6a879'
             'f8f35bcc54ed888b72b8660319ad089b7243b9e8d83aefabdb8f0111fcb0b728'
@@ -35,8 +41,8 @@ sha256sums=('e59880dfe320c5a97c5adc59980c66ef8bd1bbac4ddb1d02fa03221d31f8654d'
             '28a90da56de5d6591a2e65154778030ba28b375d29556fd7e1db085d2c00b877'
             '93fe183a2f0a35989b3d1678dddb1c5976cda94747d4186c6f36af4ccf144443'
             '8282f527b54e9d8fe009640b7634560f3b4bf0fc9b72cdc2f865f1c226339d35'
-            '3faf5cbdb9683badd45230246d525e313d5447414c9da4c18fa553440bf29748'
-            'c07e00be5f264a853dc96845b875b2762c1b1fbcdacd274853b2d7b841149f1b'
+            '8e9f0d7138ab5da6b4b899f39234f6e3c48d0d47970c6b12372e33e86e39d606'
+            '134bbc9088b8c323c9a17a7ea8a39942e4cf4b83e149cb4f89e161adf7290122'
             '1fd56e04072372e1e8dab0bae40da1519d82a28895cbe5661b18561ee9ea47b4'
             '649c2a4f2c0dfa1a096192cd6a24206fba19512a1b8094663b9cfb21a93a2d35'
             'd1938c4422ad9f4b00703b29edfb4bb39aa7e5c6b4ad64a38cd530d88cec46f3')
@@ -47,6 +53,14 @@ else
 fi
 
 prepare(){
+  # Prepare XPLUS archive
+  cat "$xplus_tfe".part* > "$xplus_tfe"
+  cat "$xplus_tse".part* > "$xplus_tse"
+
+  # Install the XPLUS Modification data.
+  tar -xJvf "$srcdir/$xplus_tse" -C "$srcdir/$_srcname/SamTFE/"
+  tar -xJvf "$srcdir/$xplus_tse" -C "$srcdir/$_srcname/SamTSE/"
+
   # Making building scripts.
   cd "$srcdir/$_srcname/SamTFE/Sources/"
   sed -i 's/cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo/cmake -DCMAKE_BUILD_TYPE=Release/g' build-linux"$_bits".sh
@@ -84,7 +98,7 @@ build(){
   rm -fr "Tools.Win32"
 
   rm -f  "$srcdir/$_srcname"/{*.sh,*.old}
-  rm -fr "$srcdir/$_srcname/images"
+  rm -fr "$srcdir/$_srcname/Images"
 }
 
 package(){
@@ -92,12 +106,9 @@ package(){
   install -d $pkgdir/usr/share/{applications,pixmaps,licenses}
   install -d $pkgdir/usr/bin/
 
-  # Install the XPLUS Modification data.
-  cat "$srcdir/"$xplus_tfe".part* > "$srcdir/$xplus_tfe"
-  cat "$srcdir/"$xplus_tse".part* > "$srcdir/$xplus_tse"
-  extract "$srcdir/$xplus_tse" -d "$srcdir/$_srcname/SamTFE/"
-  extract "$srcdir/$xplus_tse" -d "$srcdir/$_srcname/SamTSE/"
-  rm -f  "$srcdir"/{*.xz} 
+  # Install license.
+  install -D -m 644 $srcdir/$_srcname/LICENSE \
+       $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
   # Install data.
   mv "$srcdir/$_srcname" "$pkgdir/usr/share/$pkginstdir"
@@ -108,10 +119,6 @@ package(){
   install -D -m 755 $srcdir/serioussam-tse.sh \
        $pkgdir/usr/share/$pkginstdir/SamTSE
 
-  # Install license.
-  install -D -m 644 $srcdir$_srcname/LICENSE \
-       $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
   # Install desktop file.
   install -D -m 644 $srcdir/serioussam-tfe.desktop \
            $pkgdir/usr/share/applications/serioussam-tfe.desktop
diff --git a/serioussam.install b/serioussam.install
index 6c493ef15d3d..7be3d9face90 100644..100755
--- a/serioussam.install
+++ b/serioussam.install
@@ -2,9 +2,9 @@ post_install() {
 	echo ""
 	echo "     ***************************************************************************************"
 	echo "     If you have access to a copy of the game (either by CD or through Steam),"
-	echo "     you can copy the *.gro files to the /usr/share/SamTFE directory."
+	echo "     you can copy the *.gro files to the /usr/share/serioussam/SamTFE directory."
 	echo "     for the game Serious Sam Classic The First Encounter and copy the *.gro files "
-	echo "     to the /usr/share/SamTSE directory. for Serious Sam Classic The First Encounter"
+	echo "     to the /usr/share/serioussam/SamTSE directory. for Second Encounter"
 	echo "     ***************************************************************************************"
 	echo "     Copy all *.gro files and Help folder from the game directory to SamTFE directory."
 	echo "     At the current time the files are:"
diff --git a/serioussam.xpm b/serioussam.xpm
index 9a7ae6246ace..9a7ae6246ace 100644..100755
--- a/serioussam.xpm
+++ b/serioussam.xpm