From 2e80973d67259cdf88e9726a2f2029c859bee9bf Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Fri, 18 Aug 2023 22:45:13 +0000 Subject: [PATCH] fix steamdeps --- .../apt/preferences.d/0-pika-default-settings | 33 ------------------- .../apt/preferences.d/0-pika-firefox-settings | 4 +++ ...n-repo-settings => 0-pika-radeon-settings} | 0 .../apt/preferences.d/1-pika-ubuntu-settings | 14 ++++++++ .../apt/preferences.d/51-ppa-default-settings | 4 --- pika-sources/usr/share/dpkg/scripts/steamdeps | 8 +++-- 6 files changed, 24 insertions(+), 39 deletions(-) delete mode 100644 pika-sources/etc/apt/preferences.d/0-pika-default-settings create mode 100644 pika-sources/etc/apt/preferences.d/0-pika-firefox-settings rename pika-sources/etc/apt/preferences.d/{0-radeon-repo-settings => 0-pika-radeon-settings} (100%) create mode 100644 pika-sources/etc/apt/preferences.d/1-pika-ubuntu-settings delete mode 100644 pika-sources/etc/apt/preferences.d/51-ppa-default-settings diff --git a/pika-sources/etc/apt/preferences.d/0-pika-default-settings b/pika-sources/etc/apt/preferences.d/0-pika-default-settings deleted file mode 100644 index d9d0560..0000000 --- a/pika-sources/etc/apt/preferences.d/0-pika-default-settings +++ /dev/null @@ -1,33 +0,0 @@ -# PikaOS Launchpad Priority Override -Package: * -Pin: release o=LP-PPA-pikaos-pika -Pin-Priority: 1000 - -# PikaOS APT Priority Override -Package: * -Pin: release o=ppa.pika-os.com -Pin-Priority: 1000 - -# Mesa Priority Override -Package: * -Pin: release o=LP-PPA-kisak-kisak-mesa -Pin-Priority: 1000 - -# Firefox Priority Override -Package: * -Pin: release o=LP-PPA-mozillateam -Pin-Priority: 2001 - -# Kubuntu Priority Override -Package: * -Pin: release o=LP-PPA-kubuntu-ppa-backports -Pin-Priority: 1000 - -# Enable Feature Updates -Package: * -Pin: release a=$(lsb_release -cs)-backports -Pin-Priority: 500 - -Package: * -Pin: release a=$(lsb_release -cs)-proposed -Pin-Priority: 500 diff --git a/pika-sources/etc/apt/preferences.d/0-pika-firefox-settings b/pika-sources/etc/apt/preferences.d/0-pika-firefox-settings new file mode 100644 index 0000000..34a87c7 --- /dev/null +++ b/pika-sources/etc/apt/preferences.d/0-pika-firefox-settings @@ -0,0 +1,4 @@ +# Firefox Priority Override +Package: * +Pin: release o=LP-PPA-mozillateam +Pin-Priority: 501 \ No newline at end of file diff --git a/pika-sources/etc/apt/preferences.d/0-radeon-repo-settings b/pika-sources/etc/apt/preferences.d/0-pika-radeon-settings similarity index 100% rename from pika-sources/etc/apt/preferences.d/0-radeon-repo-settings rename to pika-sources/etc/apt/preferences.d/0-pika-radeon-settings diff --git a/pika-sources/etc/apt/preferences.d/1-pika-ubuntu-settings b/pika-sources/etc/apt/preferences.d/1-pika-ubuntu-settings new file mode 100644 index 0000000..1017b27 --- /dev/null +++ b/pika-sources/etc/apt/preferences.d/1-pika-ubuntu-settings @@ -0,0 +1,14 @@ +# Lower Ubuntu's priority under pika's +Package: * +Pin: release o=Ubuntu +Pin-Priority: 400 + +# Enable Ubuntu's Feature Updates +Package: * +Pin: release a=$(lsb_release -cs)-backports +Pin-Priority: 400 + +Package: * +Pin: release a=$(lsb_release -cs)-proposed +Pin-Priority: 400 + diff --git a/pika-sources/etc/apt/preferences.d/51-ppa-default-settings b/pika-sources/etc/apt/preferences.d/51-ppa-default-settings deleted file mode 100644 index 4b8e501..0000000 --- a/pika-sources/etc/apt/preferences.d/51-ppa-default-settings +++ /dev/null @@ -1,4 +0,0 @@ -# Make PPAs have the highest-priority above all -Package: * -Pin: release o=LP-PPA-* -Pin-Priority: 2000 diff --git a/pika-sources/usr/share/dpkg/scripts/steamdeps b/pika-sources/usr/share/dpkg/scripts/steamdeps index e500dfb..8e3110e 100755 --- a/pika-sources/usr/share/dpkg/scripts/steamdeps +++ b/pika-sources/usr/share/dpkg/scripts/steamdeps @@ -17,5 +17,9 @@ import shutil import subprocess import sys - -subprocess.run(["/usr/bin/x-terminal-emulator -e bash -c 'sudo apt install -y libc6:amd64 libc6:i386'"], shell=True) \ No newline at end of file +check_output = subprocess.run(["dpkg -s libc6:amd64 && dpkg -s libc6:i386"], shell=True) +if (check_output.returncode) != 0: + subprocess.run(["/usr/bin/x-terminal-emulator -e bash -c 'sudo apt install -y libc6:amd64 libc6:i386'"], shell=True) + exit(0) +else + exit(0) \ No newline at end of file