Update popos-trinity.sh

popos-trinity.sh

@@ -1,18 +1,30 @@
-#! /bin/sh
-cd $HOME
-sudo apt-get update && \
-    sudo apt-get install -y \
+#!/bin/sh
+
+set -e  # Detener si hay error
+
+cd "$HOME"
+
+# Añadir PPA para Qt 6.9+ en Ubuntu 22.04 (Jammy)
+sudo add-apt-repository -y ppa:beineri/opt-qt-6.9.0-jammy
+sudo apt-get update
+
+# Instalar dependencias (adaptadas a Jammy + PPA de Qt6)
+sudo apt-get install -y \
     build-essential git curl wget cmake clang ninja-build \
-    qt6-base-dev qt6-base-dev-tools qt6-declarative-dev qt6-webengine-dev qt6-tools-dev \
+    qt6-base-dev qt6-base-dev-tools qt6-declarative-dev qt6-tools-dev \
     libcurl4-openssl-dev libssl-dev \
-    libasound2-dev libpulse-dev libjack-jackd2-dev libpipewire-0.3-dev libsndio-dev \
+    libasound2-dev libpulse-dev libjack-jackd2-dev libpipewire-0.3-dev \
     libx11-dev libxi-dev libxext-dev libxfixes-dev libxcursor-dev libxrandr-dev libxss-dev libxtst-dev \
     libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libvulkan-dev vulkan-validationlayers \
     libdrm-dev libgbm-dev \
     libudev-dev libevdev-dev libusb-1.0-0-dev libdbus-1-dev libbluetooth-dev bluez \
     libibus-1.0-dev libxkbcommon-dev \
-    libpng-dev libzip-dev libcups2-dev 
+    libpng-dev libzip-dev libcups2-dev
+
+# Nota: libsndio-dev no existe en Jammy → omitido
+# Nota: qt6-webengine-dev no está disponible → se omite (Trinity Launcher no lo requiere obligatoriamente si no usa WebEngine)
 
+# Clonar e instalar mcpelauncher-client-extend
 git clone https://codeberg.org/javiercplus/mcpelauncher-client-extend.git
 cd mcpelauncher-client-extend
 mkdir -p build
@@ -23,13 +35,15 @@ CC=clang CXX=clang++ cmake .. \
   -DGAMEWINDOW_SYSTEM=SDL3 \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
-  -DCMAKE_C_FLAGS=" -mtune=generic "\
-  -DCMAKE_CXX_FLAGS=" -mtune=generic "\
-  -Wno-dev &&
+  -DCMAKE_C_FLAGS="-mtune=generic" \
+  -DCMAKE_CXX_FLAGS="-mtune=generic" \
+  -Wno-dev
+
 make -j$(getconf _NPROCESSORS_ONLN)
-cd ..
-sudo make -C build install
+sudo make install
+cd "$HOME"
 
+# Clonar e instalar mcpe-extract
 git clone https://codeberg.org/javiercplus/mcpe-extract.git
 cd mcpe-extract
 mkdir -p build
@@ -37,17 +51,24 @@ cd build
 cmake .. -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 make -j$(nproc)
 sudo make install
+cd "$HOME"
 
-cd $HOME 
+# Clonar e instalar Trinity Launcher
 git clone https://github.com/Trinity-LA/Trinity-Launcher.git
 cd Trinity-Launcher
+
+# Asegurar permisos y ejecutar build.sh
+chmod +x build.sh
 ./build.sh
-sudo cp -rf trinito /usr/local/bin/
-sudo cp -rf trinchete /usr/local/bin/
-sudo cp -rf resources/com.trench.trinity.launcher.svg /usr/share/icons/
-sudo cp -rf resources/com.trench.trinity.launcher.desktop /usr/share/applications/
-
-#rm -rf $HOME/build.sh
-rm -rf $HOME/mcpelauncher-client-extend
-rm -rf $HOME/mcpe-extract
-rm -rf $HOME/Trinity-Launcher
+
+# Instalar binarios y recursos del sistema
+sudo cp -f trinito /usr/local/bin/
+sudo cp -f trinchete /usr/local/bin/
+sudo cp -f resources/com.trench.trinity.launcher.svg /usr/share/icons/
+sudo cp -f resources/com.trench.trinity.launcher.desktop /usr/share/applications/
+
+# Limpieza (opcional)
+# rm -f build.sh
+rm -rf mcpelauncher-client-extend mcpe-extract Trinity-Launcher
+
+echo "¡Instalación completada en Pop!_OS"