From b5b9b8454379a5970b4b3e99c1bd54c264a04787 Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Tue, 14 Jan 2020 16:21:06 +0100
Subject: [PATCH] fetch command fixes

---
 commands/apt_fetch    | 4 ++--
 commands/pacman_fetch | 2 +-
 include/commands.h    | 8 ++++----
 src/main.cpp          | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/commands/apt_fetch b/commands/apt_fetch
index 8d037c1..249e54b 100644
--- a/commands/apt_fetch
+++ b/commands/apt_fetch
@@ -1,2 +1,2 @@
-sudo apt update >/dev/null || return $?
-apt list --upgradable 2>/dev/null | tail -n +2 | awk -F "/" '{print $1" "$2}' | tr -d ']' | awk '{print $1" "$7" -> "$3}'
+sudo apt-get update >/dev/null || return $?
+apt-get list --upgradable 2>/dev/null | tail -n +2 | awk -F "/" '{print $1" "$2}' | tr -d ']' | awk '{print $1" "$7" -> "$3}'
diff --git a/commands/pacman_fetch b/commands/pacman_fetch
index 5d5ca9a..7ad451f 100644
--- a/commands/pacman_fetch
+++ b/commands/pacman_fetch
@@ -4,4 +4,4 @@ mkdir -p "$CHECKUPDATES_DB"
 ln -sf "${DBPath}/local" "$CHECKUPDATES_DB" > /dev/null 2>&1
 fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null >/dev/null || return $?
 pacman -Qu --dbpath "$CHECKUPDATES_DB/" 2> /dev/null | grep -v '\[.*\]'
-return 0
+exit 0
diff --git a/include/commands.h b/include/commands.h
index da5fdaf..96153b3 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -2,7 +2,7 @@
 #define COMMANDS_H
 
 // pacman
-#define PACMAN_FETCH_COMMAND              "CHECKUPDATES_DB=\"${TMPDIR:-/tmp}/checkup-db-${USER}/\"\nDBPath=\"$(pacman-conf DBPath)\"\nmkdir -p \"$CHECKUPDATES_DB\"\nln -sf \"${DBPath}/local\" \"$CHECKUPDATES_DB\" > /dev/null 2>&1\nfakeroot pacman -Sy --dbpath \"$CHECKUPDATES_DB\" --logfile /dev/null >/dev/null || return $?\npacman -Qu --dbpath \"$CHECKUPDATES_DB/\" 2> /dev/null | grep -v '\\[.*\\]'\nreturn 0"
+#define PACMAN_FETCH_COMMAND              "CHECKUPDATES_DB=\"${TMPDIR:-/tmp}/checkup-db-${USER}/\"\nDBPath=\"$(pacman-conf DBPath)\"\nmkdir -p \"$CHECKUPDATES_DB\"\nln -sf \"${DBPath}/local\" \"$CHECKUPDATES_DB\" > /dev/null 2>&1\nfakeroot pacman -Sy --dbpath \"$CHECKUPDATES_DB\" --logfile /dev/null >/dev/null || return $?\npacman -Qu --dbpath \"$CHECKUPDATES_DB/\" 2> /dev/null | grep -v '\\[.*\\]'\nexit 0"
 #define AUR_FETCH_COMMAND                 "yay -Qau"
 
 #define PACMAN_UPDATE_COMMAND             "sudo pacman -Syu"
@@ -17,9 +17,9 @@
 #define PACMAN_LOCAL_SIZE_CUT_COMMAND     " |grep 'Installed Size'|cut -d':' -f2|tr -d ' '|cut -d'i' -f1 | tr -d 'B'|numfmt --from=iec|tr -d '\n'"
 
 // apt/dpkg
-#define APT_FETCH_COMMAND                 "sudo apt update >/dev/null || return $?\napt list --upgradable 2>/dev/null | tail -n +2 | awk -F \"/\" '{print $1\" \"$2}' | tr -d ']' | awk '{print $1\" \"$7\" -> \"$3}'"
-#define APT_UPDATE_COMMAND                "sudo apt upgrade"
-#define APT_UPDATE_COMMAND_NOCONFIRM      "echo y | sudo apt upgrade"
+#define APT_FETCH_COMMAND                 "sudo apt-get update >/dev/null || return $?\napt-get list --upgradable 2>/dev/null | tail -n +2 | awk -F \"/\" '{print $1\" \"$2}' | tr -d ']' | awk '{print $1\" \"$7\" -> \"$3}'"
+#define APT_UPDATE_COMMAND                "sudo apt-get upgrade"
+#define APT_UPDATE_COMMAND_NOCONFIRM      "sudo apt-get -y upgrade"
 
 #define APT_EXT_INFO_COMMAND              "apt show "
 #define APT_LOCAL_INFO_COMMAND            "dpkg -s "
diff --git a/src/main.cpp b/src/main.cpp
index 4b8066e..52d8bba 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,6 +18,8 @@ int main(int argc, char* argv[])
   catch(ztd::option_error& e)
   {
     printf("%s\n", e.what());
+    if(e.type() == ztd::option_error::unknown_option)
+      help();
     return 1;
   }