From ea269ffd9933be4501140b717719d87e477bea0a Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 14 Nov 2024 23:48:11 +0300 Subject: [PATCH] fix greps --- .github/release-nest-v3 | 2 +- data/scripts/partition-utility.sh | 14 +++++++------- debian/changelog | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 301160a..f11c82a 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -8 \ No newline at end of file +9 \ No newline at end of file diff --git a/data/scripts/partition-utility.sh b/data/scripts/partition-utility.sh index 492c60f..8db81a6 100755 --- a/data/scripts/partition-utility.sh +++ b/data/scripts/partition-utility.sh @@ -54,26 +54,26 @@ fi if [[ "$1" = "get_partitions" ]] then lsblk -ln -o NAME,TYPE | grep -E "part|crypt|lvm" | awk '{print $1}' | while read i ; do - if lsblk -ln -o NAME,TYPE | grep "$i" | grep "crypt" > /dev/null 2>&1 + if lsblk -ln -o NAME,TYPE | grep -w "$i" | grep "crypt" > /dev/null 2>&1 then - echo "mapper/$(lsblk -ln -o NAME,TYPE | grep "$i" | awk '{print $1}')" + echo "mapper/$(lsblk -ln -o NAME,TYPE | grep -w "$i" | awk '{print $1}')" fi - if lsblk -ln -o NAME,TYPE | grep "$i" | grep "lvm" > /dev/null 2>&1 + if lsblk -ln -o NAME,TYPE | grep -w "$i" | grep "lvm" > /dev/null 2>&1 then - echo "mapper/$(lsblk -ln -o NAME,TYPE | grep "$i" | awk '{print $1}')" + echo "mapper/$(lsblk -ln -o NAME,TYPE | grep -w "$i" | awk '{print $1}')" fi - if lsblk -ln -o NAME,TYPE | grep "$i" | grep "part" > /dev/null 2>&1 + if lsblk -ln -o NAME,TYPE | grep -w "$i" | grep "part" > /dev/null 2>&1 then - lsblk -ln -o NAME,TYPE | grep "$i" | awk '{print $1}' + lsblk -ln -o NAME,TYPE | grep -w "$i" | awk '{print $1}' fi done fi if [[ "$1" = "get_part_fs" ]] then - lsblk -ln -o NAME,FSTYPE | grep "$2" | awk '{print $2}' + lsblk -ln -o NAME,FSTYPE | grep -w "$2" | awk '{print $2}' fi if [[ "$1" = "get_part_size" ]] diff --git a/debian/changelog b/debian/changelog index 76884e1..5e5fc44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-installer-gtk4 (2.0.1-101pika1) pika; urgency=low +pika-installer-gtk4 (2.0.1-101pika2) pika; urgency=low * Refine UI