From 1c3d5d2dcfde5155456d71405dc31f0a7c4918a1 Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Mon, 9 Mar 2020 14:25:27 +0100
Subject: [PATCH] Fix root check

---
 src/main.sh | 6 ++++--
 src/util.sh | 2 +-
 src/view.sh | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main.sh b/src/main.sh
index 4895c26..730e100 100644
--- a/src/main.sh
+++ b/src/main.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-[ -z "$opt_f" ] && root_check || exit 10
+if [ -z "$opt_f" ] ; then
+  root_check || exit 10
+fi
+
 
 if [ -n "$1" ]
 then
@@ -88,7 +91,6 @@ then
     then
       echo "No package specified" > /dev/stderr
     else
-      root_check
       shift 1
       for I in $*
       do
diff --git a/src/util.sh b/src/util.sh
index 05cb939..8cc12f9 100644
--- a/src/util.sh
+++ b/src/util.sh
@@ -29,7 +29,7 @@ root_check()
   if [ "$(id | cut -d'=' -f2 | cut -d'(' -f1)" -eq 0 ]
   then
     echo "Cannot run as root" > /dev/stderr
-    return $1
+    return 1
   fi
   return 0
 }
diff --git a/src/view.sh b/src/view.sh
index 7a06616..c976492 100644
--- a/src/view.sh
+++ b/src/view.sh
@@ -12,7 +12,7 @@ resolve_packages()
   cd "$PKG_PATH"
   for I in $*
   do
-    if ! grep -wq "^$I" pkglist
+    if ! grep -wq "^$I" pkglist 2>/dev/null
     then
       [ "$LOG" = "true" ] && echo "Package '$I' not found" > /dev/stderr
       RET=1
@@ -38,7 +38,7 @@ resolve_deps()
 is_installed()
 {
   cd "$PKG_PATH"
-  grep -qw "^$1" installed
+  grep -qw "^$1" installed 2>/dev/null
   return $?
 }