summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-09-16 23:52:39 +0200
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2017-10-30 15:59:05 +0100
commite4db687d108d7e7cd32654b9c8eed4c7c12cb094 (patch)
tree98160ffa32cc87a320ebe944319e5dac5dfaf051
parentddd508efc083fc9beb6f2c96e2537521b31c1e6f (diff)
downloaddevtools-e4db687d108d7e7cd32654b9c8eed4c7c12cb094.tar.gz
devtools-e4db687d108d7e7cd32654b9c8eed4c7c12cb094.tar.xz
makechrootpkg: move init_variables() to be part of main()
The reason it wasn't moved before was just to keep the diffs (with --ignore-all-space) smaller, to make merging and rebasing work easier. Moving code around in a file tends to make that difficult. But, readability wise, it belongs in main().
-rw-r--r--makechrootpkg.in44
1 files changed, 20 insertions, 24 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 8724355..f81c47e 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -15,29 +15,6 @@ m4_include(lib/archroot.sh)
shopt -s nullglob
-init_variables() {
- default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
- makepkg_args=("${default_makepkg_args[@]}")
- keepbuilddir=false
- update_first=false
- clean_first=false
- run_namcap=false
- temp_chroot=false
- chrootdir=
- passeddir=
- makepkg_user=
- declare -ga install_pkgs
- declare -gi ret=0
-
- bindmounts_ro=()
- bindmounts_rw=()
-
- copy=$USER
- [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
- [[ -z "$copy" || $copy = root ]] && copy=copy
- src_owner=${SUDO_USER:-$USER}
-}
-
usage() {
echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
echo ' Run this script in a PKGBUILD dir to build a package inside a'
@@ -325,7 +302,26 @@ move_products() {
# }}}
main() {
- init_variables
+ default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
+ makepkg_args=("${default_makepkg_args[@]}")
+ keepbuilddir=false
+ update_first=false
+ clean_first=false
+ run_namcap=false
+ temp_chroot=false
+ chrootdir=
+ passeddir=
+ makepkg_user=
+ declare -a install_pkgs
+ declare -i ret=0
+
+ bindmounts_ro=()
+ bindmounts_rw=()
+
+ copy=$USER
+ [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+ [[ -z "$copy" || $copy = root ]] && copy=copy
+ src_owner=${SUDO_USER:-$USER}
while getopts 'hcur:I:l:nTD:d:U:' arg; do
case "$arg" in