Compare commits
2 commits
4a0309c4a9
...
02679c7d46
Author | SHA1 | Date | |
---|---|---|---|
02679c7d46 | |||
f308cddb20 |
3 changed files with 116 additions and 1 deletions
|
@ -19,8 +19,14 @@ RUN sed -i -e 's/NoProgressBar/#NoProgressBar/' -e 's/NoExtract/#NoExtract/' /et
|
||||||
# Force reinstall of packages which have man pages (shouldn't redownload any that were just upgraded)
|
# Force reinstall of packages which have man pages (shouldn't redownload any that were just upgraded)
|
||||||
RUN mkdir -p /usr/share/man && pacman -Qo /usr/share/man | awk '{print $5}' | xargs pacman -S --noconfirm man-db
|
RUN mkdir -p /usr/share/man && pacman -Qo /usr/share/man | awk '{print $5}' | xargs pacman -S --noconfirm man-db
|
||||||
|
|
||||||
|
# COPY add-aur.sh /
|
||||||
|
# RUN bash /add-aur.sh
|
||||||
|
# RUN aur-install delta
|
||||||
|
# RUN rm /add-aur.sh
|
||||||
|
|
||||||
# Clean up cache
|
# Clean up cache
|
||||||
RUN yes | pacman -Scc
|
RUN yes | pacman -Scc
|
||||||
|
|
||||||
|
|
||||||
# Enable sudo permission for wheel users
|
# Enable sudo permission for wheel users
|
||||||
RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/toolbox
|
RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/toolbox
|
||||||
|
|
109
add-aur.sh
Normal file
109
add-aur.sh
Normal file
|
@ -0,0 +1,109 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# this script takes two arguments and sets up unattended AUR access for user ${1} via a helper, ${2}
|
||||||
|
set -o pipefail
|
||||||
|
set -o errexit
|
||||||
|
set -o nounset
|
||||||
|
set -o verbose
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
AUR_USER="${1:-ab}"
|
||||||
|
HELPER="${2:-paru}"
|
||||||
|
|
||||||
|
# update mirrorlist
|
||||||
|
#curl --silent --location https://raw.githubusercontent.com/greyltc/docker-archlinux/master/get-new-mirrors.sh > /tmp/get-new-mirrors
|
||||||
|
#chmod +x /tmp/get-new-mirrors
|
||||||
|
#mv /tmp/get-new-mirrors /bin/.
|
||||||
|
#get-new-mirrors
|
||||||
|
|
||||||
|
# we're gonna need sudo to use the helper properly
|
||||||
|
pacman --sync --needed --noconfirm --noprogressbar sudo || echo "Nothing to do"
|
||||||
|
|
||||||
|
# create the user
|
||||||
|
AUR_USER_HOME="/var/${AUR_USER}"
|
||||||
|
useradd "${AUR_USER}" --system --shell /usr/bin/nologin --create-home --home-dir "${AUR_USER_HOME}"
|
||||||
|
|
||||||
|
# lock out the AUR_USER's password
|
||||||
|
passwd --lock "${AUR_USER}"
|
||||||
|
|
||||||
|
# give the aur user passwordless sudo powers for pacman
|
||||||
|
echo "${AUR_USER} ALL=(ALL) NOPASSWD: /usr/bin/pacman" > "/etc/sudoers.d/allow_${AUR_USER}_to_pacman"
|
||||||
|
|
||||||
|
# let root cd with sudo
|
||||||
|
echo "root ALL=(ALL) CWD=* ALL" > /etc/sudoers.d/permissive_root_Chdir_Spec
|
||||||
|
|
||||||
|
# build config setup
|
||||||
|
sudo -u ${AUR_USER} -D~ bash -c 'mkdir -p .config/pacman'
|
||||||
|
|
||||||
|
# use all possible cores for builds
|
||||||
|
sudo -u ${AUR_USER} -D~ bash -c 'echo MAKEFLAGS="-j\$(nproc)" > .config/pacman/makepkg.conf'
|
||||||
|
|
||||||
|
# don't compress the packages built here
|
||||||
|
#sudo -u ${AUR_USER} -D~ bash -c 'echo PKGEXT=".pkg.tar" >> .config/pacman/makepkg.conf'
|
||||||
|
|
||||||
|
# setup storage for AUR packages built
|
||||||
|
NEW_PKGDEST="/var/cache/makepkg/pkg"
|
||||||
|
NPDP=$(dirname "${NEW_PKGDEST}")
|
||||||
|
mkdir -p "${NPDP}"
|
||||||
|
install -o "${AUR_USER}" -d "${NEW_PKGDEST}"
|
||||||
|
sudo -u ${AUR_USER} -D~ bash -c "echo \"PKGDEST=${NEW_PKGDEST}\" >> .config/pacman/makepkg.conf"
|
||||||
|
|
||||||
|
# setup place for foreign packages
|
||||||
|
FOREIGN_PKG="/var/cache/foreign-pkg"
|
||||||
|
FPP=$(dirname "${FOREIGN_PKG}")
|
||||||
|
mkdir -p "${FPP}"
|
||||||
|
install -o "${AUR_USER}" -d "${FOREIGN_PKG}"
|
||||||
|
|
||||||
|
# get helper pkgbuild
|
||||||
|
sudo -u "${AUR_USER}" -D~ bash -c "curl --silent --location https://aur.archlinux.org/cgit/aur.git/snapshot/${HELPER}.tar.gz | bsdtar -xvf -"
|
||||||
|
|
||||||
|
# make helper
|
||||||
|
sudo -u "${AUR_USER}" -D~//${HELPER} bash -c "makepkg -s --noprogressbar --noconfirm --needed"
|
||||||
|
|
||||||
|
# install helper
|
||||||
|
pacman --upgrade --needed --noconfirm --noprogressbar "${NEW_PKGDEST}"/*.pkg.*
|
||||||
|
|
||||||
|
# cleanup
|
||||||
|
sudo rm -rf "${NEW_PKGDEST}"/*
|
||||||
|
rm -rf "${AUR_USER_HOME}/${HELPER}"
|
||||||
|
rm -rf "${AUR_USER_HOME}/.cache/go-build"
|
||||||
|
rm -rf "${AUR_USER_HOME}/.cargo"
|
||||||
|
|
||||||
|
# chuck deps
|
||||||
|
pacman -Rns --noconfirm $(pacman -Qtdq) || echo "Nothing to remove"
|
||||||
|
|
||||||
|
tee /bin/aur-install <<EOF
|
||||||
|
#!/bin/sh
|
||||||
|
if test "\$#" -ne 0
|
||||||
|
then
|
||||||
|
if test "${HELPER}" = paru
|
||||||
|
then
|
||||||
|
sudo -u ${AUR_USER} -D~ bash -c 'paru --sync --skipreview --removemake --needed --noconfirm --noprogressbar "\$@"' true "\$@"
|
||||||
|
else
|
||||||
|
sudo -u ${AUR_USER} -D~ bash -c '${HELPER} --sync --needed --noconfirm --noprogressbar "\$@"' true "\$@"
|
||||||
|
fi
|
||||||
|
for foreign in \$(pacman -Qmq)
|
||||||
|
do
|
||||||
|
sudo find "${NEW_PKGDEST}" -name "\${foreign}*" -exec mv -fv "{}" "${FOREIGN_PKG}" \;
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# clean
|
||||||
|
if test "${HELPER}" = paru
|
||||||
|
then
|
||||||
|
DELETE_OPT=" --delete"
|
||||||
|
sudo -u "${AUR_USER}" -D~ bash -c "yes | paru --clean >/dev/null 2>&1" || :
|
||||||
|
else
|
||||||
|
DELETE_OPT=""
|
||||||
|
fi
|
||||||
|
sudo -u "${AUR_USER}" -D~ bash -c "yes | ${HELPER} --sync -cc\${DELETE_OPT} >/dev/null 2>&1"
|
||||||
|
sudo rm -rf "${NEW_PKGDEST}"/*
|
||||||
|
EOF
|
||||||
|
chmod +x /bin/aur-install
|
||||||
|
|
||||||
|
if test "${HELPER}" = yay || test "${HELPER}" = paru
|
||||||
|
then
|
||||||
|
/bin/aur-install ${HELPER}
|
||||||
|
|
||||||
|
echo "Packages from the AUR can now be installed like this:"
|
||||||
|
echo "aur-install package-number-one package-number-two"
|
||||||
|
fi
|
|
@ -6,4 +6,4 @@ zoxide
|
||||||
fzf
|
fzf
|
||||||
eza
|
eza
|
||||||
lazygit
|
lazygit
|
||||||
delta
|
git-delta
|
||||||
|
|
Loading…
Reference in a new issue