From adfe3ce6cdf3e430e206da7559242be05a6d55a7 Mon Sep 17 00:00:00 2001 From: Florian RICHER Date: Sun, 8 Sep 2024 21:05:15 +0200 Subject: [PATCH] tips(kdedev): Migrate to fedora latest and fix configure.sh --- tips/distrobox/kde/configure.sh | 17 +++++------------ tips/distrobox/kde/distrobox.ini | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/tips/distrobox/kde/configure.sh b/tips/distrobox/kde/configure.sh index abb0ae0..f6e0812 100755 --- a/tips/distrobox/kde/configure.sh +++ b/tips/distrobox/kde/configure.sh @@ -1,16 +1,9 @@ #!/bin/bash -if [[ $PATH != *".local/bin"* ]]; then - echo "Append .local/bin to PATH in ~/.bashrc" - echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc - echo "Reload shell" - source ~/.bashrc -fi - -if [[ $PATH != *"alias new_shell"* ]]; then - echo "Append new_shell alias to PATH in ~/.bashrc" - echo 'alias new_shell="env -u PATH -u QML2_IMPORT_PATH -u QT_PLUGIN_PATH -u NIXPKGS_QT6_QML_IMPORT_PATH -u XDG_CONFIG_DIRS bash -l"' >> ~/.bashrc - echo "Reload shell" +if ! grep -Fxq "source ~/.kde_bashrc" ~/.bashrc +then + cp .kde_bashrc ~/.kde_bashrc + echo "source ~/.kde_bashrc" > ~/.bashrc source ~/.bashrc fi @@ -22,6 +15,6 @@ echo "Run initial setup from kde-builder" kde-builder --initial-setup echo "Install missing dependencies" -sudo dnf install qt6-*-devel +sudo dnf install qt6-*-devel librsvg2-devel echo "Configuration DONE" \ No newline at end of file diff --git a/tips/distrobox/kde/distrobox.ini b/tips/distrobox/kde/distrobox.ini index d5101d2..180ff56 100644 --- a/tips/distrobox/kde/distrobox.ini +++ b/tips/distrobox/kde/distrobox.ini @@ -1,5 +1,5 @@ [kdedev] -image=quay.io/fedora/fedora:rawhide +image=quay.io/fedora/fedora:latest home="${HOME}/.distrobox_home/kdedev" nvidia=true root=false