Loading archbuild.in +8 −2 Original line number Original line Diff line number Diff line Loading @@ -17,11 +17,13 @@ else fi fi chroots='/var/lib/archbuild' chroots='/var/lib/archbuild' clean_first=false clean_first=false update=true usage() { usage() { echo "Usage: $cmd [options] -- [makechrootpkg args]" echo "Usage: $cmd [options] -- [makechrootpkg args]" echo ' -h This help' echo ' -h This help' echo ' -c Recreate the chroot before building' echo ' -c Recreate the chroot before building' echo ' -U Do not update chroots before building' echo ' -r <dir> Create chroots in this directory' echo ' -r <dir> Create chroots in this directory' echo '' echo '' echo "Default makechrootpkg args: ${makechrootpkg_args[*]}" echo "Default makechrootpkg args: ${makechrootpkg_args[*]}" Loading @@ -31,9 +33,11 @@ usage() { orig_argv=("$@") orig_argv=("$@") while getopts 'hcr:' arg; do while getopts 'hcr:U' arg; do case "${arg}" in case "${arg}" in c) clean_first=true ;; c) clean_first=true ;; U) update=false makechrootpkg_args=(-n) ;; r) chroots="$OPTARG" ;; r) chroots="$OPTARG" ;; *) usage ;; *) usage ;; esac esac Loading Loading @@ -67,7 +71,9 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then -M "@pkgdatadir@/makepkg-${arch}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" || abort "${base_packages[@]}" || abort else elif $update; then msg "Updating chroot for [${repo}] (${arch})..." lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" arch-nspawn \ arch-nspawn \ -C "@pkgdatadir@/pacman-${repo}.conf" \ -C "@pkgdatadir@/pacman-${repo}.conf" \ Loading zsh_completion.in +1 −0 Original line number Original line Diff line number Diff line Loading @@ -4,6 +4,7 @@ m4_include(lib/valid-tags.sh) _archbuild_args=( _archbuild_args=( '-c[Recreate the chroot before building]' '-c[Recreate the chroot before building]' '-U[Do not update chroots before building]' '-r[Create chroots in this directory]:base_dir:_files -/' '-r[Create chroots in this directory]:base_dir:_files -/' ) ) Loading Loading
archbuild.in +8 −2 Original line number Original line Diff line number Diff line Loading @@ -17,11 +17,13 @@ else fi fi chroots='/var/lib/archbuild' chroots='/var/lib/archbuild' clean_first=false clean_first=false update=true usage() { usage() { echo "Usage: $cmd [options] -- [makechrootpkg args]" echo "Usage: $cmd [options] -- [makechrootpkg args]" echo ' -h This help' echo ' -h This help' echo ' -c Recreate the chroot before building' echo ' -c Recreate the chroot before building' echo ' -U Do not update chroots before building' echo ' -r <dir> Create chroots in this directory' echo ' -r <dir> Create chroots in this directory' echo '' echo '' echo "Default makechrootpkg args: ${makechrootpkg_args[*]}" echo "Default makechrootpkg args: ${makechrootpkg_args[*]}" Loading @@ -31,9 +33,11 @@ usage() { orig_argv=("$@") orig_argv=("$@") while getopts 'hcr:' arg; do while getopts 'hcr:U' arg; do case "${arg}" in case "${arg}" in c) clean_first=true ;; c) clean_first=true ;; U) update=false makechrootpkg_args=(-n) ;; r) chroots="$OPTARG" ;; r) chroots="$OPTARG" ;; *) usage ;; *) usage ;; esac esac Loading Loading @@ -67,7 +71,9 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then -M "@pkgdatadir@/makepkg-${arch}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" || abort "${base_packages[@]}" || abort else elif $update; then msg "Updating chroot for [${repo}] (${arch})..." lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" arch-nspawn \ arch-nspawn \ -C "@pkgdatadir@/pacman-${repo}.conf" \ -C "@pkgdatadir@/pacman-${repo}.conf" \ Loading
zsh_completion.in +1 −0 Original line number Original line Diff line number Diff line Loading @@ -4,6 +4,7 @@ m4_include(lib/valid-tags.sh) _archbuild_args=( _archbuild_args=( '-c[Recreate the chroot before building]' '-c[Recreate the chroot before building]' '-U[Do not update chroots before building]' '-r[Create chroots in this directory]:base_dir:_files -/' '-r[Create chroots in this directory]:base_dir:_files -/' ) ) Loading