summaryrefslogtreecommitdiff
path: root/makechrootpkg.in
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-05-10 19:26:22 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-05-10 19:26:22 -0400
commit4fcf9f8582cc78699b64884b872fe2578464c660 (patch)
treefc397c3dc65e2b80bd93f71e95b27a0eb4ade96f /makechrootpkg.in
parentead868c7fa430c647d52d746e515aecd0c3c0cae (diff)
Tidy up.
Diffstat (limited to 'makechrootpkg.in')
-rw-r--r--makechrootpkg.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index e2dd0b7..f646117 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -12,8 +12,8 @@ m4_include(lib/common.sh)
shopt -s nullglob
-_makepkg_args=(-s --noconfirm -L --holdver)
-makepkg_args=("${_makepkg_args[@]}")
+default_makepkg_args=(-s --noconfirm -L --holdver)
+makepkg_args=("${default_makepkg_args[@]}")
repack=false
update_first=false
clean_first=false
@@ -47,7 +47,7 @@ usage() {
echo 'command:'
echo ' mkarchroot <chrootdir>/root base-devel'
echo ''
- echo "Default makepkg args: ${_makepkg_args[*]}"
+ echo "Default makepkg args: ${default_makepkg_args[*]}"
echo ''
echo 'Flags:'
echo '-h This help'
@@ -355,8 +355,8 @@ move_products() {
umask 0022
-load_vars /etc/makepkg.conf
load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
# Use PKGBUILD directory if these don't exist
[[ -d $PKGDEST ]] || PKGDEST=$PWD