From 7f4683c65304a594c9ffe1ffd5474685abe581f4 Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Mon, 2 Sep 2024 03:38:40 +0300
Subject: [PATCH] Use dpkg status check

---
 .github/release-nest-v3                                |  2 +-
 data/scripts/check-pkg.sh                              | 10 ++++++++++
 data/scripts/codec.sh                                  |  4 ++--
 debian/changelog                                       |  2 +-
 .../recommended_addons_page/mod.rs                     |  3 +--
 5 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100755 data/scripts/check-pkg.sh

diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
index 7813681..62f9457 100644
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/data/scripts/check-pkg.sh b/data/scripts/check-pkg.sh
new file mode 100755
index 0000000..64e64bf
--- /dev/null
+++ b/data/scripts/check-pkg.sh
@@ -0,0 +1,10 @@
+#! /usr/bin/bash
+export LANG=C
+
+package=$1
+if dpkg-query -W -f='${Status}' $package 2>/dev/null | grep -q "install ok installed"
+then
+    exit 0
+else
+    exit 1
+fi
\ No newline at end of file
diff --git a/data/scripts/codec.sh b/data/scripts/codec.sh
index 233891d..20d1143 100755
--- a/data/scripts/codec.sh
+++ b/data/scripts/codec.sh
@@ -19,7 +19,7 @@ INSTALLED="no"
 
 package_check() {
       # Check if codecs are already installed
-      dpkg -s pika-codecs-meta
+      /usr/lib/pika/pika-welcome/scripts/check-pkg.sh pika-codecs-meta
       if [ $? -eq 0 ]; then
           export INSTALLED="yes"
       fi
@@ -86,4 +86,4 @@ if [[ $INSTALLED == "no" ]]; then
 	fi
 else
 	zenity --error --title='No Codec Change Required!' --text='All required Codecs are already installed!'
-fi
\ No newline at end of file
+fi
diff --git a/debian/changelog b/debian/changelog
index be2402c..b8907c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pika-welcome (5.0.0-101pika3) pika; urgency=low
+pika-welcome (5.0.0-101pika4) pika; urgency=low
 
   * Port to PikaOS 4
 
diff --git a/src/welcome_content_page/recommended_addons_page/mod.rs b/src/welcome_content_page/recommended_addons_page/mod.rs
index e918eae..4976885 100644
--- a/src/welcome_content_page/recommended_addons_page/mod.rs
+++ b/src/welcome_content_page/recommended_addons_page/mod.rs
@@ -156,8 +156,7 @@ pub fn recommended_addons_page(
 
         gio::spawn_blocking(
             clone!(@strong checkpkg_status_loop_sender, @strong entry_checkpkg => move || loop {
-                let checkpkg_command = Command::new("dpkg")
-                    .arg("-s")
+                let checkpkg_command = Command::new("/usr/lib/pika/pika-welcome/scripts/check-pkg.sh")
                     .arg(&entry_checkpkg)
                     .output()
                     .expect("failed to execute process");