diff --git a/config/desktop/trixie/environments/kde-plasma-mobile/config_base/packages b/config/desktop/trixie/environments/kde-plasma-mobile/config_base/packages index 1cac26cc8d..54f714af1e 100644 --- a/config/desktop/trixie/environments/kde-plasma-mobile/config_base/packages +++ b/config/desktop/trixie/environments/kde-plasma-mobile/config_base/packages @@ -17,3 +17,4 @@ pavucontrol pavucontrol-qt pulseaudio-module-bluetooth chromium +pipewire diff --git a/extensions/odin2-preset-firstrun.sh b/extensions/odin2-preset-firstrun.sh index e64532171f..503ccfab78 100644 --- a/extensions/odin2-preset-firstrun.sh +++ b/extensions/odin2-preset-firstrun.sh @@ -49,15 +49,31 @@ function post_family_tweaks__preset_configs() { # Preset user default realname echo "PRESET_DEFAULT_REALNAME=Odin2" >> "${SDCARD}"/root/.not_logged_in_yet - - - # clone starter scripts } function pre_customize_image__add_odin2_scripts() { display_alert "Adding Odin2 Scripts" "${EXTENSION}" "info" - chroot_sdcard mkdir -p /home/odin2/sys - chroot_sdcard git clone https://github.com/Squishy123/odin2-scripts.git /home/odin2/sys/odin2-scripts + local launcher_dir="${SDCARD}/usr/local" + run_host_command_logged mkdir -pv "${launcher_dir}" + + chroot_sdcard git clone https://github.com/Squishy123/odin2-scripts.git "$launcher_dir/odin2-scripts" + + + local launcher_dir="${SDCARD}/usr/local/bin" + local launcher_file="${launcher_dir}/install-odin2-scripts" + run_host_command_logged mkdir -pv "${launcher_dir}" + + cat <<- 'INSTALL_ODIN_2_SCRIPT' > "${launcher_file}" + #!/usr/bin/env bash + if [[ ! -d ~/sys/odin2-scripts ]]; then + mkdir -p ~/sys + git clone https://github.com/Squishy123/odin2-scripts.git ~/sys/odin2-scripts + fi + cd ~/sys/odin2-scripts + INSTALL_ODIN_2_SCRIPT + + run_host_command_logged chmod -v +x "${launcher_file}" + display_alert "Added Odin2 Scripts" "${EXTENSION}" "info" }