Install package-query and yaourt only if yaourt wasn't installed.

This commit is contained in:
hak8or 2017-11-15 00:29:37 -05:00
parent 9182863f9c
commit 18b1bbb85a
1 changed files with 18 additions and 16 deletions

View File

@ -68,22 +68,24 @@ sed -i 's/if (( EUID == 0 )); then/if (( 0 )); then/' /usr/bin/makepkg > $LOGFIL
# itself to be ran as root, even though all we have is root in the container, # itself to be ran as root, even though all we have is root in the container,
# and I don't want to bother fiddling with users just for this. Yaourt on the # and I don't want to bother fiddling with users just for this. Yaourt on the
# other hand works fine for this. # other hand works fine for this.
echo "$TAGSTR Installing package-query and yaourt" if ! type yaourt &> /dev/null; then
mkdir ~/tmp echo "$TAGSTR Installing package-query and yaourt"
cd ~/tmp mkdir ~/tmp
# ----------- package query for yaourt ----------- cd ~/tmp
git clone https://aur.archlinux.org/package-query.git > $LOGFILE 2>&1 # ----------- package query for yaourt -----------
cd package-query git clone https://aur.archlinux.org/package-query.git > $LOGFILE 2>&1
makepkg -si --noconfirm > $LOGFILE 2>&1 cd package-query
cd .. makepkg -si --noconfirm > $LOGFILE 2>&1
# ----------- yaourt itself ----------- cd ..
git clone https://aur.archlinux.org/yaourt.git > $LOGFILE 2>&1 # ----------- yaourt itself -----------
cd yaourt git clone https://aur.archlinux.org/yaourt.git > $LOGFILE 2>&1
makepkg -si --noconfirm > $LOGFILE 2>&1 cd yaourt
cd .. makepkg -si --noconfirm > $LOGFILE 2>&1
# Wipe tmp dir cd ..
cd .. # Wipe tmp dir
rm -r -f ~/tmp cd ..
rm -r -f ~/tmp
fi
# Get the ip addresses using some grep and awk magic. # Get the ip addresses using some grep and awk magic.
# Magic inspired by this: https://superuser.com/questions/468727/how-to-get-the-ipv6-ip-address-of-linux-machine # Magic inspired by this: https://superuser.com/questions/468727/how-to-get-the-ipv6-ip-address-of-linux-machine