zawz/zupdate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fetch command fixes

Browse source
This commit is contained in:
zawz 2020-01-14 16:21:06 +01:00
parent 69044664c6
commit b5b9b84543
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/apt_fetch
View file

@ -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}' apt-get list --upgradable 2>/dev/null | tail -n +2 | awk -F "/" '{print $1" "$2}' | tr -d ']' | awk '{print $1" "$7" -> "$3}'

2
commands/pacman_fetch
View file

@ -4,4 +4,4 @@ mkdir -p "$CHECKUPDATES_DB"
ln -sf "${DBPath}/local" "$CHECKUPDATES_DB" > /dev/null 2>&1 ln -sf "${DBPath}/local" "$CHECKUPDATES_DB" > /dev/null 2>&1
fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null >/dev/null || return $? fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null >/dev/null || return $?
pacman -Qu --dbpath "$CHECKUPDATES_DB/" 2> /dev/null | grep -v '\[.*\]' pacman -Qu --dbpath "$CHECKUPDATES_DB/" 2> /dev/null | grep -v '\[.*\]'
return 0 exit 0

8
include/commands.h
View file

@ -2,7 +2,7 @@
#define COMMANDS_H #define COMMANDS_H
// pacman // 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 AUR_FETCH_COMMAND "yay -Qau"
#define PACMAN_UPDATE_COMMAND "sudo pacman -Syu" #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'" #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 // 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_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 upgrade" #define APT_UPDATE_COMMAND "sudo apt-get upgrade"
#define APT_UPDATE_COMMAND_NOCONFIRM "echo y | sudo apt upgrade" #define APT_UPDATE_COMMAND_NOCONFIRM "sudo apt-get -y upgrade"
#define APT_EXT_INFO_COMMAND "apt show " #define APT_EXT_INFO_COMMAND "apt show "
#define APT_LOCAL_INFO_COMMAND "dpkg -s " #define APT_LOCAL_INFO_COMMAND "dpkg -s "

2
src/main.cpp
View file

@ -18,6 +18,8 @@ int main(int argc, char* argv[])
catch(ztd::option_error& e) catch(ztd::option_error& e)
{ {
printf("%s\n", e.what()); printf("%s\n", e.what());
if(e.type() == ztd::option_error::unknown_option)
help();
return 1; return 1;
} }