riyyi/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Manager: Suppress error output, fix Debian package list

Browse Source
This commit is contained in:
Riyyi
2022-02-28 11:58:39 +01:00
parent 946c896f28
commit 8d8a21166b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dotfiles.sh
+5 -4
View File
@@ -272,7 +272,7 @@ osDependencies()
getPackageList() getPackageList()
{ {
if [ "$os" = "arch" ]; then if [ "$os" = "arch" ]; then
filterList="$( (pacman -Qqg base base-devel; pactree -u base | tail -n +2) | sort)" filterList="$( (pacman -Qqg base base-devel 2> /dev/null; pactree -u base | tail -n +2) | sort -u)"
packageList="$(pacman -Qqe | grep -vx "$filterList" | sort)" packageList="$(pacman -Qqe | grep -vx "$filterList" | sort)"
elif [ "$os" = "debian" ]; then elif [ "$os" = "debian" ]; then
installedList="$(dpkg-query --show --showformat='${Package}\t${Priority}\n')" installedList="$(dpkg-query --show --showformat='${Package}\t${Priority}\n')"
@@ -302,7 +302,7 @@ packageInstall()
fi fi
elif [ "$os" = "debian" ]; then elif [ "$os" = "debian" ]; then
# Grab everything off enabled official repositories that is in the list # Grab everything off enabled official repositories that is in the list
repoList="$(apt-cache search .* | cut -d ' ' -f 1 | grep -xf $packageFile)" repoList="$(apt-cache search . | cut -d ' ' -f 1 | grep -xf $packageFile)"
# Install packages # Install packages
echo "$repoList" | xargs --open-tty sudo apt install echo "$repoList" | xargs --open-tty sudo apt install
@@ -319,6 +319,7 @@ packages()
if [ "$1" = "list" ] || [ "$1" = "" ]; then if [ "$1" = "list" ] || [ "$1" = "" ]; then
[ -z "$packageList" ] && getPackageList [ -z "$packageList" ] && getPackageList
# FIXME: This only selects 1 target
echo "$packageList" | grep "$2" echo "$packageList" | grep "$2"
elif [ "$1" = "store" ]; then elif [ "$1" = "store" ]; then
[ -z "$packageList" ] && getPackageList [ -z "$packageList" ] && getPackageList
@@ -335,8 +336,8 @@ packages()
script="$(basename "$0")" script="$(basename "$0")"
parsed="$(getopt --options "hFPails" \ parsed="$(getopt --options "hFPails" \
--longoptions "help,file,package,add,aur-install,install,pull,push,store" \ --longoptions "help,file,package,add,aur-install,install,pull,push,store" \
-n "$script" -- "$@" 2>&1)" -n "$script" -- "$@" 2>&1)"
result="$?" result="$?"
# Exit if invalid option is provided # Exit if invalid option is provided