Merge branch 'master' of square-r00t.net:bdisk

2015-01-10 15:49:59 -05:00 · 2015-01-10 15:49:59 -05:00 · 4516168d99
commit 4516168d99
parent 065db383a2 a7b777ce40
5 changed files with 2 additions and 60 deletions
--- a/extra/bootstrap/apacman-0.9-1-any.pkg.tar.xz
+++ b/extra/bootstrap/apacman-0.9-1-any.pkg.tar.xz
--- a/extra/bootstrap/cower-12-2-x86_64.pkg.tar.xz
+++ b/extra/bootstrap/cower-12-2-x86_64.pkg.tar.xz
--- a/extra/bootstrap/pacaur-4.2.15-1-any.pkg.tar.xz
+++ b/extra/bootstrap/pacaur-4.2.15-1-any.pkg.tar.xz
--- a/extra/pre-build.d/etc/yaourtrc
+++ b/extra/pre-build.d/etc/yaourtrc
@ -1,57 +0,0 @@
-#    yaourtrc  - Configuration for yaourt
-# 
-#   See yaourtrc(5) for more information
-#   
-#
-
-# General
-#AUTOSAVEBACKUPFILE=0
-#DEVELBUILDDIR="/var/abs/local/yaourtbuild"
-#DEVEL=0
-#EDITOR="$EDITOR"
-#FORCEENGLISH=0
-#FORCE=0
-#TMPDIR="/tmp"
-TMPDIR="/var/tmp"
-
-# SUDO
-#SUDONOVERIF=0      # Avoid multiple sudo checks when timestamp_timeout=0
-#SUDOREDIRECT=1     # Define to 0 in case you use a fingerprint device
-
-# ABS
-# If the package "abs" is installed, those var are parsed from abs.conf
-#REPOS=()           # REPOS available at $SYNCSERVER
-#SYNCSERVER=""
-
-# AUR
-#AURURL="https://aur.archlinux.org"
-AURCOMMENT=0
-#AURDEVELONLY=0
-#AURSEARCH=1
-#AURUPGRADE=0
-#AURVOTE=1
-
-# Build
-#EXPORT=0           # Export to 1: EXPORTDIR or PKGDEST
-                    # 2: pacman cache (as root)
-#EXPORTSRC=0        # Need EXPORT>0 to be used
-#EXPORTDIR=""       # If empty, use makepkg's connfiguration (see makepkg.conf)
-
-# Prompt
-NOCONFIRM=0
-UP_NOCONFIRM=1
-BUILD_NOCONFIRM=1
-PU_NOCONFIRM=1
-EDITFILES=0
-NOENTER=1
-
-# Output
-USECOLOR=1
-#USEPAGER=0
-DETAILUPGRADE=1
-SHOWORPHANS=1
-TERMINALTITLE=1
-
-# Command
-#PACMAN="pacman"
-#DIFFEDITCMD="vimdiff"
--- a/lib/mk.chroot.sh
+++ b/lib/mk.chroot.sh
@ -182,9 +182,8 @@ EOF
    ## https://projects.archlinux.org/pacman.git/tree/NEWS#n54
    ## https://bugs.archlinux.org/task/43302
    #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    mkdir -p ${i}/tmp/apacman && cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/tmp/.
-    tar -zxf ${i}/tmp/apacman.tar.gz -C ${i}/tmp/apacman
-    ${CHROOTCMD} ${i}/ "chown -R nobody:nobody /tmp/apacman* ; cd /tmp/apacman/apacman ' sudo -u nobody makepkg ; pacman --noconfirm -U apacman-*.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/tmp/.
+    ${CHROOTCMD} ${i} "pacman --noconfirm -U /tmp/apacman-*.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
    ${CHROOTCMD} ${i}/ "apacman -S --noconfirm --noedit apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
    #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
    for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done