From a514aa8b72a2d7f12c5210491aa724e38b79bc0e Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Mon, 25 May 2020 17:22:10 +0200
Subject: [PATCH] Fix apt ubuntu

---
 Makefile            |  4 +++-
 README.md           |  4 ----
 commands/apt_fetch  |  2 +-
 include/commands.h  | 11 +++++------
 src/package_man.cpp |  5 +++++
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index d89584d..543a25a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,11 @@ NAME = zupdate
 LDFLAGS = -lpthread
 
 CC=g++
-CXXFLAGS= -I$(IDIR) -Wall -std=c++17 -fopenmp -O2
+CXXFLAGS= -I$(IDIR) -Wall -std=c++17 -fopenmp
 ifeq	 ($(DEBUG),true)
 	CXXFLAGS += -g
+else
+	CXXFLAGS += -O2
 endif
 ifeq ($(STATIC),true)
 	LDFLAGS += -l:libztd.a
diff --git a/README.md b/README.md
index f9a13a3..18e6d37 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,6 @@ Supported package managers:
 Optional dependencies:  
 - yay (AUR support for arch)  
 
-#### /!\
-
-Does not work with ubuntu
-
 #### Building
 
 ``make -j8`` for a shared build  
diff --git a/commands/apt_fetch b/commands/apt_fetch
index 8d037c1..3b30e18 100644
--- a/commands/apt_fetch
+++ b/commands/apt_fetch
@@ -1,2 +1,2 @@
-sudo apt update >/dev/null || return $?
+sudo apt-get 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}'
diff --git a/include/commands.h b/include/commands.h
index 09c8ab0..b9fd8f8 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -14,13 +14,12 @@
 #define PACMAN_LOCAL_SIZE_COMMAND     "pacman -Qi %s |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 2>&1 || 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 update && sudo apt upgrade"
-#define APT_UPDATE_COMMAND_NOCONFIRM      "sudo apt update && sudo apt -y upgrade"
-
-#define APT_EXT_SIZE_COMMAND          "apt show %s 2>/dev/null| grep -E 'Installed-Size:|Download-Size:' | cut -d' ' -f2- | tr -d ', B' | tr 'k' 'K' | numfmt --from=iec | awk '{s=$0;getline;s=$0\"\\n\"s;print s}'"
-#define APT_LOCAL_SIZE_COMMAND        "dpkg -s %s 2>/dev/null| grep 'Installed-Size:' | cut -d' ' -f2 | xargs echo '1024 *' | bc"
+#define APT_FETCH_COMMAND                 "sudo apt-get update >/dev/null 2>&1 || 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-get update && sudo apt-get upgrade"
+#define APT_UPDATE_COMMAND_NOCONFIRM      "sudo apt-get update && sudo apt-get -y upgrade"
 
+#define APT_EXT_SIZE_COMMAND          "apt-cache show --no-all-versions %s 2>/dev/null| grep -E '^Installed-Size:|^Size:' | awk 'NR==1 {print $2*1024} NR==2 {print $2}' | tac"
+#define APT_LOCAL_SIZE_COMMAND        "dpkg -s %s 2>/dev/null| grep 'Installed-Size:' | cut -d' ' -f2 | awk '{print $1*1024}'"
 
 
 #endif //COMMANDS_H
diff --git a/src/package_man.cpp b/src/package_man.cpp
index b05aef3..5dcd201 100644
--- a/src/package_man.cpp
+++ b/src/package_man.cpp
@@ -144,6 +144,11 @@ int apt_process()
     std::cerr << "apt not found\n";
     return 1;
   }
+  if(!exec_find("apt-get"))
+  {
+    std::cerr << "apt-get not found\n";
+    return 1;
+  }
   if(!exec_find("apt-cache"))
   {
     std::cerr << "apt-cache not found\n";