Merge pull request #17 from T00fy/master

Fix for CK3/other games with similar directory structure

.gitignore

@@ -2,4 +2,6 @@ build/
 .cache
 .vscode
 lib/
-output
+output
+.idea
+cmake-build-debug/

README.md

@@ -10,6 +10,7 @@ This *should* work for any linux native steam title that doesn't block LD_PRELOA
  - Hearts Of Iron IV
  - Europa Universalis IV
  - Crusader Kings II
+ - Crusader Kings III
  - PAYDAY 2
  
 ## Usage 
@@ -52,16 +53,26 @@ This is normal. The DLCs should still work.
 Have you made sure to download the latest version of the DLC files? Sometimes unrelated patches or updates to the game will modify some DLC files, and creamlinux is currently somewhat sensitive to outdated files.
 
 ## Game not starting after enabling creamlinux
-Have you made sure that you actually put the creamlinux files in the game's directory? (I sometimes forget to move them out of the `creamlinux` folder into the game directory proper)
+Are you sure that the creamlinux files are at the game's root directory and not in a subfolder?
+
+Try setting the executable flag of the `cream.sh` script (it should be set already, but just in case):
+```
+chmod +x cream.sh
+```
 
 ## Nothing helped!
 Please collect a log using the instructions below, then post an issue describing your situation [here](https://github.com/anticitizn/creamlinux/issues/new).
 
 ## Gathering logs
-Install `konsole` and set your game launch options to this:
+If using a KDE environment, set your game launch options to this:
 ```
 konsole --hold -e sh ./cream.sh %command%
 ```
+Or if you are using Gnome environment, you can set your launch options to this:
+```
+gnome-terminal -- sh -c "./cream.sh %command%; exec bash"
+```
+If using neither, install `konsole` and follow the KDE step.
 Then launch the game (skip any launchers like the Paradox launcher if possible, they interfere with the logging). Wait for the game to load if applicable, close it, then copy and paste the contents of the terminal.
 
 # Advanced 

package/cream.sh

@@ -1,10 +1,28 @@
 #!/bin/bash
-cp "$PWD/lib32Creamlinux.so" /tmp/lib32Creamlinux.so
-cp "$PWD/lib64Creamlinux.so" /tmp/lib64Creamlinux.so
-cp "$PWD/libsteam_api.so" /tmp/libsteam_api.so
+copy_file() {
+    cp "$1" "$2" || { echo "Error: Failed to copy $1 to $2"; exit 1; }
+}
+
+LIBSTEAM_API_DIR=$(find . -name "libsteam_api.so" -printf "%h\n" | head -n 1)
+[ -z "$LIBSTEAM_API_DIR" ] && { echo "Error: libsteam_api.so not found."; exit 1; }
+if [ ! -z "$CREAM_CONFIG_PATH" ]; then
+    if [ ! -f "$CREAM_CONFIG_PATH/cream_api.ini" ]; then
+        echo "Error: cream_api.ini not found in CREAM_CONFIG_PATH."; exit 1;
+    fi
+else
+    if [ ! -f "$PWD/cream_api.ini" ]; then
+        echo "Error: cream_api.ini not found in the current working directory."; exit 1;
+    fi
+fi
+if [ -z "$CREAM_CONFIG_PATH" ] && [ "$LIBSTEAM_API_DIR" != "$PWD" ]; then
+    export CREAM_CONFIG_PATH="$PWD/cream_api.ini"
+fi
+
+copy_file "$PWD/lib32Creamlinux.so" /tmp/lib32Creamlinux.so
+copy_file "$PWD/lib64Creamlinux.so" /tmp/lib64Creamlinux.so
+copy_file "$LIBSTEAM_API_DIR/libsteam_api.so" /tmp/libsteam_api.so
+
 LD_PRELOAD="$LD_PRELOAD /tmp/lib64Creamlinux.so /tmp/lib32Creamlinux.so /tmp/libsteam_api.so" "$@"
 EXITCODE=$?
-rm /tmp/lib32Creamlinux.so
-rm /tmp/lib64Creamlinux.so
-rm /tmp/libsteam_api.so
+rm -f /tmp/lib32Creamlinux.so /tmp/lib64Creamlinux.so /tmp/libsteam_api.so
 exit $EXITCODE

package/cream_api.ini

@@ -72,6 +72,7 @@ disable_steamapps_issubscribedapp = false
 1889490 = Stellaris: Overlord
 2115770 = Stellaris: Toxoids Species Pack
 2277860 = Stellaris: First Contact Story Pack
+2380030 = Stellaris: Galactic Paragons
 978950 = Imperator: Rome - Hellenistic World Flavor Pack
 1173860 = Imperator: Rome - The Punic Wars Content Pack
 1252870 = Imperator: Rome - Magna Graecia Content Pack
@@ -83,6 +84,10 @@ disable_steamapps_issubscribedapp = false
 1303182 = Crusader Kings III: Royal Court
 1303184 = Crusader Kings III: Fate of Iberia
 2114760 = Crusader Kings III: Friends & Foes
+2311920 = Crusader Kings III: Tours and Tournaments
+2311930 = Crusader Kings III: Elegance of the Empire
+2313541 = Crusader Kings III: Wards and Wardens
+2313540 = Crusader Kings III: Legacy of Persia
 801650 = Surviving Mars - Stellaris Dome Set
 801710 = Surviving Mars: Deluxe Edition Upgrade Pack
 801690 = Surviving Mars: Mysteries Resupply Pack
@@ -281,48 +286,65 @@ disable_steamapps_issubscribedapp = false
 279621 = Europa Universalis IV: Muslim Ships Unit Pack
 279622 = Europa Universalis IV: Trade Nations Unit Pack
 279623 = Europa Universalis IV: Res Publica
+295220 = Europa Universalis IV: Anthology of Alternate History
 295221 = Europa Universalis IV: Indian Subcontinent Unit Pack
 295222 = Europa Universalis IV: Indian Ships Unit Pack
+304590 = Europa Universalis IV: Wealth of Nations E-book
 310030 = Europa Universalis IV: Republican Music Pack (Skopje Sessions)
 310031 = Europa Universalis IV: Art of War
 310032 = Europa Universalis IV: Evangelical Union Unit Pack
 310033 = Europa Universalis IV: Catholic League Unit Pack
 310034 = Europa Universalis IV: Songs of War Music Pack
 327830 = Europa Universalis IV: Guns, Drums and Steel Music Pack
+327831 = Europa Universalis IV: Art of War Ebook
 338160 = Europa Universalis IV: El Dorado
 338161 = Europa Universalis IV: El Dorado Content Pack
 338162 = Europa Universalis IV: Guns, Drums and Steel Volume 2
-354790 = Europa Universalis IV: Women in History
 338163 = Europa Universalis IV: Common Sense
+354790 = Europa Universalis IV: Women in History
 373150 = Europa Universalis IV: Common Sense Content Pack
-373400 = Europa Universalis IV: Sounds from the community - Kairis Soundtrack
+373160 = Europa Universalis IV: Common Sense E-Book
 373370 = Europa Universalis IV: The Cossacks
 373380 = Europa Universalis IV: The Cossacks Content Pack
-415680 = Europa Universalis IV: Sabaton Soundtrack
+373400 = Europa Universalis IV: Sounds from the community - Kairis Soundtrack
+414300 = Europa Universalis IV: Catholic Majors Unit Pack
 414301 = Europa Universalis IV: Catholic Majors Unit Pack
-539260 = Europa Universalis IV: Evangelical Majors Unit Pack
+415680 = Europa Universalis IV: Sabaton Soundtrack
 436120 = Europa Universalis IV: Mare Nostrum
 436121 = Europa Universalis IV: Mare Nostrum Content Pack
 443720 = Europa Universalis IV: Kairis Soundtrack Part II
+472030 = Europa Universalis IV: Fredman's Epistles
 486570 = Europa Universalis IV: Rights of Man
 486571 = Europa Universalis IV: Rights of Man Content Pack
-487150 = Europa Universalis IV: Songs of Regency
-472030 = Europa Universalis IV: Fredman's Epistles
 486970 = Europa Universalis IV: Fredman's Midsummer Epistles
+487150 = Europa Universalis IV: Songs of Regency
 538020 = Europa Universalis IV: Mandate of Heaven
 538021 = Europa Universalis IV: Mandate of Heaven Content Pack
+539260 = Europa Universalis IV: Evangelical Majors Unit Pack
+617960 = Europa Universalis IV: Ultimate Music Pack
+617961 = Europa Universalis IV: Ultimate E-book Pack
+617962 = Europa Universalis IV: Early Upgrade Pack
 625050 = Europa Universalis IV: Third Rome
-642780 = Europa Universalis IV: The Rus Awaken
+625170 = Europa Universalis IV: Call-to-Arms Pack
+625171 = Europa Universalis IV: Digital Extreme Edition Upgrade Pack
+625172 = Europa Universalis IV: Pre-Order Pack
+642780 = Europa Universalis IV: The Rus Awakening
 721340 = Europa Universalis IV: Cradle of Civilization
-721341 = Europa Universalis IV: Cradle of Civilization Content Pack
+721341 = Europa Universalis IV: Cradle of Civilization
 760070 = Europa Universalis IV: Rule Britannia
-775740 = Europa Universalis IV: Rule Britannia Music Pack
+768340 = Europa Universalis IV: Monuments to Power Pack
 827240 = Europa Universalis IV: Dharma
 827250 = Europa Universalis IV: Dharma Content Pack
+834360 = Europa Universalis IV: Ultimate Unit Pack
+957010 = Europa Universalis IV: Dharma Collection
 960920 = Europa Universalis IV: Golden Century
 1009630 = Europa Universalis IV: Imperator Unit Pack
 1259360 = Europa Universalis IV: Emperor
 1264340 = Europa Universalis IV: Emperor Content Pack
 1416420 = Europa Universalis IV: Leviathan
 1756130 = Europa Universalis IV: Origins
+1756190 = Europa Universalis IV - Guns, Drums and Steel Vol 3
+1896050 = Europa Universalis IV - Expansion Subscription
 2012010 = Europa Universalis IV: Lions of the North
+2223660 = Europa Universalis IV: Domination
+2350610 = Europa Universalis IV: Domination (Pre-Purchase Bonus)