feat: cataclysm TLG support [macata #97]

.github/workflows/sonarcloud.yml

@@ -39,4 +39,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=dazednconfused_macata-launcher
+        run: |
+          mvn -B verify sonar:sonar \
+            -Dsonar.projectKey=dazednconfused_macata-launcher \
+            -Dsonar.organization=dazednconfused \
+            -Dsonar.token=$SONAR_TOKEN

pom.xml

@@ -13,7 +13,8 @@
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <sonar.organization>dazednconfused</sonar.organization>
+        <sonar.organization>dazednconfused</sonar.organization> <!-- should match .github/workflows/sonarcloud.yml -->
+        <sonar.projectKey>dazednconfused_macata-launcher</sonar.projectKey> <!-- ^ditto -->
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.cpd.exclusions>**/gui/**</sonar.cpd.exclusions>
     </properties>

src/main/resources/osx_launcher_wrapper.sh

@@ -20,12 +20,15 @@ else
     export ${K_LIBRARY_PATH}=. ${K_FRAMEWORK_PATH}=.
 fi
 
-# check if 'cataclysm-tiles' or 'cataclysm-bn-tiles' exists, and run the appropriate one
-if [[ -f ./cataclysm-tiles ]]; then
-    EXECUTABLE="./cataclysm-tiles"
-elif [[ -f ./cataclysm-bn-tiles ]]; then
-    EXECUTABLE="./cataclysm-bn-tiles"
-else
+# find the first matching executable that starts with "cataclysm-" and is executable
+for candidate in ./cataclysm-*; do
+    if [[ -x "$candidate" && ! -d "$candidate" ]]; then
+        EXECUTABLE="$candidate"
+        break
+    fi
+done
+
+if [[ -z "$EXECUTABLE" ]]; then
     echo "No valid executable found!"
     exit 1
 fi