fix names

This commit is contained in:
Didier Slof 2022-12-18 21:43:34 +01:00
parent 4ef7f7756f
commit a307370a15
Signed by: didier
GPG key ID: 01E71F18AA4398E5
3 changed files with 10 additions and 7 deletions

View file

@ -1,4 +1,5 @@
^pacman -Syyu ^. ./sync.conf && $PM_COMMAND $PM_UPGRADE
^[ -d /tmp/yay ] && rm -rf /tmp/yay ^[ -d /tmp/yay ] && rm -rf /tmp/yay
git clone https://aur.archlinux.org/yay /tmp/yay git clone https://aur.archlinux.org/yay /tmp/yay
cd /tmp/yay && makepkg --noconfirm -si && echo $PREF_TERM cd /tmp/yay && makepkg --noconfirm -si && echo $PREF_TERM

View file

@ -1,9 +1,10 @@
# PM - Package Manager Options # PM - Package Manager Options
PM_COMMAND=${PM_COMMAND:-pacman} PM_COMMAND=${PM_COMMAND:-pacman}
PM_NOCONFIRM_ARG=${PM_NOCONFIRM_ARG:-"--noconfirm"} PM_NOCONFIRM=${PM_NOCONFIRM:-"--noconfirm"}
PM_INSTALL_ARG=${PM_INSTALL_ARG:--S} PM_INSTALL=${PM_INSTALL:--S}
PM_REMOVE_ARG=${PM_REMOVE_ARG:-R} PM_REMOVE=${PM_REMOVE:-R}
PM_UPDATE_ARG=${PM_UPDATE_ARG:-Sy} PM_UPDATE=${PM_UPDATE:--Sy}
PM_UPGRADE=${PM_UPGRADE:--Syyu}
# SYS - System Options # SYS - System Options
SYS_SUDO=${SYS_SUDO:-"sudo"} SYS_SUDO=${SYS_SUDO:-"sudo"}

View file

@ -11,8 +11,9 @@ PULL_GIT=${PULL_GIT:-yes}
set -e # Exit on error set -e # Exit on error
_install_pkgs() { _install_pkgs() {
run $SYS_SUDO $PM_COMMAND $PM_UPDATE $PM_NOCONFIRM
while read -r pkg; do while read -r pkg; do
run $SYS_SUDO $PM_COMMAND $PM_INSTALL_ARG $PM_NOCONFIRM_ARG $pkg run $SYS_SUDO $PM_COMMAND $PM_INSTALL $PM_NOCONFIRM $pkg
done <$1 done <$1
} }
@ -58,5 +59,5 @@ main() {
} }
echo "# exec: start." echo "# exec: start."
time main "$@" [ bool ${TIME_TRACK:-no} ] && time main "$@" || main "$@"
echo "# exec: done." echo "# exec: done."