From f5f10cef1edce1d5d7d84be28fb204cadc3d2c67 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Thu, 13 Jul 2023 15:11:39 +0300 Subject: [PATCH] Attempt to fix accidental multi nvidia installs --- Cargo.toml | 2 +- Makefile | 2 +- data/{pika-drivers.desktop => com.pika.drivers.desktop} | 0 data/modify-driver.sh | 6 +++++- debian/changelog | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) rename data/{pika-drivers.desktop => com.pika.drivers.desktop} (100%) diff --git a/Cargo.toml b/Cargo.toml index af329d2..06d03e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pika-drivers" -version = "0.4.0" +version = "0.4.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/Makefile b/Makefile index e7714e5..1ac6065 100644 --- a/Makefile +++ b/Makefile @@ -15,4 +15,4 @@ install: mkdir -p $(DESTDIR)/usr/share/applications mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps cp -vf data/pika-drivers.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/ - cp -vf data/pika-drivers.desktop $(DESTDIR)/usr/share/applications/ + cp -vf data/com.pika.drivers.desktop $(DESTDIR)/usr/share/applications/ diff --git a/data/pika-drivers.desktop b/data/com.pika.drivers.desktop similarity index 100% rename from data/pika-drivers.desktop rename to data/com.pika.drivers.desktop diff --git a/data/modify-driver.sh b/data/modify-driver.sh index 4ec4dda..acb1775 100755 --- a/data/modify-driver.sh +++ b/data/modify-driver.sh @@ -39,5 +39,9 @@ if dpkg -s "$1" then pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY bash -c "apt remove $pkg -y && sudo apt autoremove -y" else - pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY bash -c "apt update -y && apt install $pkg -y" + if echo $pkg | grep -i nvidia + pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY bash -c "apt update -y && apt purge nvidia-driver-* -y && apt install $pkg -y && sudo apt autoremove -y" + else + pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY bash -c "apt update -y && apt install $pkg -y && sudo apt autoremove -y" + fi fi diff --git a/debian/changelog b/debian/changelog index 567805f..d625eef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-drivers (0.4.0-99pika1.lunar) lunar; urgency=medium +pika-drivers (0.4.2-99pika1.lunar) lunar; urgency=medium * initial release