From 46a52e48070f775825483d875340e562953e6eae Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Sat, 6 Jun 2020 18:22:38 +0200
Subject: [PATCH] Fix package maching for composed words

---
 src/deploy.sh  |  2 +-
 src/install.sh |  2 +-
 src/print.sh   |  4 ++--
 src/remove.sh  |  2 +-
 src/view.sh    | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/deploy.sh b/src/deploy.sh
index db29d99..eca8c3e 100644
--- a/src/deploy.sh
+++ b/src/deploy.sh
@@ -36,7 +36,7 @@ package()
 deploy_package()
 {
   echo "Deploying $(basename "$1"): $(du -sh "$1" | awk '{print $1}')iB"
-  scp "$1" $SSH_ADDRESS:~/'$(grep "PKG_PATH=" .config | cut -d"=" -f2-)'
+  scp "$1" $SSH_ADDRESS:'$(grep "PKG_PATH=" .config | cut -d"=" -f2-)'
 }
 
 deploy_folder()
diff --git a/src/install.sh b/src/install.sh
index 0107b4a..49b20e6 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -11,7 +11,7 @@ add_package_entry()
 {
   (
     cd "$PKG_PATH"
-    if grep -q -w "^$1" installed 2>/dev/null
+    if grep -q "^$1 " installed 2>/dev/null
     then
       $2 sed "s|$1 .*\$|$1 $(date +%s)|g" -i installed
     else
diff --git a/src/print.sh b/src/print.sh
index 3214e00..5beaa73 100644
--- a/src/print.sh
+++ b/src/print.sh
@@ -41,8 +41,8 @@ error() {
 package_info() {
   unset cleanup
   status="not installed"
-  grep -wq "^$1" "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$1' not found" && return 1; }
-  grep -wq "^$1" "$PKG_PATH/installed" 2>/dev/null && status=installed
+  grep -q "^$1 " "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$1' not found" && return 1; }
+  grep -q "^$1 " "$PKG_PATH/installed" 2>/dev/null && status=installed
   tmpdir="/tmp/zpkg_$(random_string 5)"
   mkdir -p "$tmpdir" || return $?
   pwd="$(pwd)"
diff --git a/src/remove.sh b/src/remove.sh
index f7178ec..3dc728d 100644
--- a/src/remove.sh
+++ b/src/remove.sh
@@ -13,7 +13,7 @@ remove_package()
 {
   cd "$PKG_PATH"
   archive="$(pwd)/$1.tar.$extension"
-  if [ ! -f "$archive" ] || ! grep -q -w "^$1" installed
+  if [ ! -f "$archive" ] || ! grep -q "^$1 " installed
   then
     echo "Package '$1' not installed" >&2
     return 1
diff --git a/src/view.sh b/src/view.sh
index 981ebbb..b8c5ba7 100644
--- a/src/view.sh
+++ b/src/view.sh
@@ -3,7 +3,7 @@
 deps()
 {
   cd "$PKG_PATH"
-  l=$(grep -w "^$1" pkglist) || return $?
+  l=$(grep "^$1 " pkglist) || return $?
   echo "$l" | cut -d' ' -f3-
 }
 
@@ -18,7 +18,7 @@ resolve_packages()
   cd "$PKG_PATH"
   for I in $*
   do
-    if ! grep -wq "^$I" pkglist 2>/dev/null
+    if ! grep -q "^$I " pkglist 2>/dev/null
     then
       [ "$LOG" = "true" ] && echo "Package '$I' not found" >&2
       RET=1
@@ -46,7 +46,7 @@ resolve_deps()
 is_installed()
 {
   cd "$PKG_PATH"
-  grep -qw "^$1" installed 2>/dev/null
+  grep -q "^$1 " installed 2>/dev/null
   return $?
 }
 
@@ -67,7 +67,7 @@ removed_packages()
   cat installed 2>/dev/null | while read -r in
   do
     name=$(echo "$in" | awk '{print $1}')
-    rem=$(grep -w "^$name" pkglist | awk '{print $2}')
+    rem=$(grep "^$name " pkglist | awk '{print $2}')
     [ -z "$rem" ] && echo $name
   done
 }
@@ -79,7 +79,7 @@ outdated_packages()
   do
     name=$(echo "$in" | awk '{print $1}')
     loc=$(echo "$in" | awk '{print $2}')
-    rem=$(grep -w "^$name" pkglist | awk '{print $2}')
+    rem=$(grep "^$name " pkglist | awk '{print $2}')
     [ -n "$rem" ] && [ "$loc" -lt "$rem" ] && echo $name
   done
 }