diff options
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r--[-rwxr-xr-x] | archbuild.in (renamed from archbuild) | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | archco.in (renamed from archco) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | archrelease.in (renamed from archrelease) | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | archrm.in (renamed from archrm) | 0 | ||||
| -rw-r--r-- | bash_completion.in (renamed from bash_completion) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | checkpkg.in (renamed from checkpkg) | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | commitpkg.in (renamed from commitpkg) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | finddeps.in (renamed from finddeps) | 29 | ||||
| -rw-r--r--[-rwxr-xr-x] | lddd.in (renamed from lddd) | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | makechrootpkg.in (renamed from makechrootpkg) | 240 | ||||
| -rw-r--r--[-rwxr-xr-x] | mkarchroot.in (renamed from mkarchroot) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | rebuildpkgs.in (renamed from rebuildpkgs) | 0 | ||||
| -rw-r--r-- | zsh_completion.in (renamed from zsh_completion) | 0 |
15 files changed, 160 insertions, 150 deletions
@@ -1,2 +1,15 @@ *~ devtools-*.tar.gz +archbuild +archco +archrelease +archrm +bash_completion +checkpkg +commitpkg +finddeps +lddd +makechrootpkg +mkarchroot +rebuildpkgs +zsh_completion @@ -47,7 +47,16 @@ ARCHBUILD_LINKS = \ multilib-build \ multilib-testing-build -all: +all: $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion + +%: %.in + @echo "GEN $@" + @sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g" "$<" >"$@" + @chmod a-w "$@" + @chmod +x "$@" + +clean: + rm -f $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion install: install -dm0755 $(DESTDIR)$(PREFIX)/bin @@ -78,4 +87,4 @@ dist: upload: scp devtools-$(V).tar.gz gerolde.archlinux.org:/srv/ftp/other/devtools/ -.PHONY: all install uninstall dist upload +.PHONY: all clean install uninstall dist upload diff --git a/archbuild b/archbuild.in index 5518996..92d2554 100755..100644 --- a/archbuild +++ b/archbuild.in @@ -54,8 +54,8 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf "${chroots}/${repo}-${arch}" mkdir -p "${chroots}/${repo}-${arch}" setarch "${arch}" mkarchroot \ - -C "/usr/share/devtools/pacman-${repo}.conf" \ - -M "/usr/share/devtools/makepkg-${arch}.conf" \ + -C "@pkgdatadir@/pacman-${repo}.conf" \ + -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" else diff --git a/archrelease b/archrelease.in index 2f6a563..2f7725e 100755..100644 --- a/archrelease +++ b/archrelease.in @@ -46,15 +46,14 @@ for tag in "$@"; do while read -r file; do trash+=("repos/$tag/$file") done < <(svn ls "repos/$tag") - svn rm -q "${trash[@]}" + [[ $trash ]] && svn rm -q "${trash[@]}" else mkdir -p "repos/$tag" svn add --parents -q "repos/$tag" fi - for file in "${known_files[@]}"; do - svn copy -q -r HEAD "$trunk/$file" "repos/$tag/" - done + # copy all files at once from trunk to the subdirectory in repos/ + svn copy -q -r HEAD ${known_files[@]/#/$trunk/} "repos/$tag/" echo 'done' done diff --git a/bash_completion b/bash_completion.in index cd959fc..cd959fc 100644 --- a/bash_completion +++ b/bash_completion.in diff --git a/checkpkg b/checkpkg.in index 94a7529..cde3dc2 100755..100644 --- a/checkpkg +++ b/checkpkg.in @@ -24,7 +24,7 @@ if [[ $arch == 'any' ]]; then fi STARTDIR=$(pwd) -TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX) +TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX) cd "$TEMPDIR" for _pkgname in "${pkgname[@]}"; do diff --git a/commitpkg b/commitpkg.in index 2a732b5..2a732b5 100755..100644 --- a/commitpkg +++ b/commitpkg.in diff --git a/finddeps b/finddeps.in index ded7a93..4651fd9 100755..100644 --- a/finddeps +++ b/finddeps.in @@ -3,7 +3,9 @@ # finddeps - find packages that depend on a given depname # -if [ "$1" = '' ]; then +match=$1 + +if [[ -z $match ]]; then echo 'usage: finddeps <depname>' echo '' echo 'Find packages that depend on a given depname.' @@ -12,35 +14,24 @@ if [ "$1" = '' ]; then exit 0 fi -match=$1 -tld=$(pwd) - -for d in $(find . -type d); do - cd $d - if [ -f PKGBUILD ]; then - unset pkgname depends makedepends - . PKGBUILD +find . -type d | while read d; do + if [[ -f "$d/PKGBUILD" ]]; then + unset pkgname depends makedepends optdepends + . "$d/PKGBUILD" for dep in "${depends[@]}"; do # lose the version comparator, if any depname=${dep%%[<>=]*} - if [ "$depname" = "$match" ]; then - echo "$d (depends)" - fi + [[ $depname = $match ]] && echo "$d (depends)" done for dep in "${makedepends[@]}"; do # lose the version comparator, if any depname=${dep%%[<>=]*} - if [ "$depname" = "$match" ]; then - echo "$d (makedepends)" - fi + [[ $depname = $match ]] && echo "$d (makedepends)" done for dep in "${optdepends[@]/:*}"; do # lose the version comaparator, if any depname=${dep%%[<>=]*} - if [ "$depname" = "$match" ]; then - echo "$d (optdepends)" - fi + [[ $depname = $match ]] && echo "$d (optdepends)" done fi - cd $tld done @@ -9,7 +9,7 @@ IFS="${IFS}:" libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)" extras= -TEMPDIR=$(mktemp -d /tmp/lddd-script.XXXX) +TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX) echo 'Go out and drink some tea, this will take a while :) ...' # Check ELF binaries in the PATH and specified dir trees. diff --git a/makechrootpkg b/makechrootpkg.in index a60c9fe..43acc3f 100755..100644 --- a/makechrootpkg +++ b/makechrootpkg.in @@ -8,27 +8,23 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -FORCE='n' -RUN='' -MAKEPKG_ARGS='-s --noconfirm' -REPACK='' -WORKDIR=$PWD +shopt -s nullglob -update_first='0' -clean_first='0' -install_pkg='' -add_to_db=0 - -chrootdir='' - -APPNAME=$(basename "${0}") +makepkg_args='-s --noconfirm -L' +repack=false +update_first=false +clean_first=false +install_pkg= +add_to_db=false +run_namcap=false +chrootdir= default_copy=$USER [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER [[ -z $default_copy || $default_copy = root ]] && default_copy=copy usage() { - echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]" + echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]" echo ' Run this script in a PKGBUILD dir to build a package inside a' echo ' clean chroot. All unrecognized arguments passed to this script' echo ' will be passed to makepkg.' @@ -41,7 +37,7 @@ usage() { echo 'command:' echo ' mkarchroot <chrootdir>/root base base-devel sudo' echo '' - echo "Default makepkg args: $MAKEPKG_ARGS" + echo "Default makepkg args: $makepkg_args" echo '' echo 'Flags:' echo '-h This help' @@ -54,27 +50,29 @@ usage() { echo '-I <pkg> Install a package into the working copy of the chroot' echo '-l <copy> The directory to use as the working copy of the chroot' echo ' Useful for maintaining multiple copies.' + echo '-n Run namcap on the package' echo " Default: $default_copy" exit 1 } -while getopts 'hcudr:I:l:' arg; do - case "${arg}" in +while getopts 'hcudr:I:l:n' arg; do + case "$arg" in h) usage ;; - c) clean_first=1 ;; - u) update_first=1 ;; - d) add_to_db=1 ;; + c) clean_first=true ;; + u) update_first=true ;; + d) add_to_db=true ;; r) chrootdir="$OPTARG" ;; I) install_pkg="$OPTARG" ;; l) copy="$OPTARG" ;; - *) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;; + n) run_namcap=true ;; + *) makepkg_args="$makepkg_args -$arg $OPTARG" ;; esac done # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$chrootdir") -if [[ ${copy:0:1} = "/" ]]; then +if [[ ${copy:0:1} = / ]]; then copydir=$copy else [[ -z $copy ]] && copy=$default_copy @@ -82,35 +80,35 @@ else fi # Pass all arguments after -- right to makepkg -MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}" +makepkg_args="$makepkg_args ${*:$OPTIND}" # See if -R was passed to makepkg for arg in ${*:$OPTIND}; do - if [ "$arg" = '-R' ]; then - REPACK=1 - break; + if [[ $arg = -R ]]; then + repack=1 + break fi done -if [ "$EUID" != '0' ]; then +if (( EUID )); then echo 'This script must be run as root.' exit 1 fi -if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then +if [[ ! -f PKGBUILD && -z $install_pkg ]]; then echo 'This must be run in a directory containing a PKGBUILD.' exit 1 fi -if [ ! -d "$chrootdir" ]; then +if [[ ! -d $chrootdir ]]; then echo "No chroot dir defined, or invalid path '$chrootdir'" exit 1 fi -if [ ! -d "$chrootdir/root" ]; then +if [[ ! -d $chrootdir/root ]]; then echo 'Missing chroot dir root directory.' echo "Try using: mkarchroot $chrootdir/root base base-devel sudo" - usage + exit 1 fi umask 0022 @@ -124,7 +122,7 @@ if ! flock -n 9; then echo "done" fi -if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then +if [[ ! -d $copydir ]] || $clean_first; then # Get a read lock on the root chroot to make # sure we don't clone a half-updated chroot exec 8>"$chrootdir/root.lock" @@ -138,8 +136,9 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then echo -n 'creating clean working copy...' use_rsync=false if type -P btrfs >/dev/null; then - [ -d $copydir ] && btrfs subvolume delete "$copydir" &>/dev/null - btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || use_rsync=true + [[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null + btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || + use_rsync=true else use_rsync=true fi @@ -154,152 +153,151 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then exec 8>&- fi -if [ -n "$install_pkg" ]; then - pkgname="$(basename "$install_pkg")" +if [[ -n $install_pkg ]]; then + pkgname="${install_pkg##*/}" cp "$install_pkg" "$copydir/$pkgname" + mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir" ret=$? + rm "$copydir/$pkgname" + # Exit early, we've done all we need to exit $ret fi -if [ $update_first -eq 1 ]; then - mkarchroot -u "$copydir" -fi +$update_first && mkarchroot -u "$copydir" -[ -d "$copydir/build" ] || mkdir "$copydir/build" +mkdir -p "$copydir/build" -if [ "$REPACK" != "1" ]; then - # Remove anything in there UNLESS -R (repack) was passed to makepkg - rm -rf "$copydir/build/"* -fi +# Remove anything in there UNLESS -R (repack) was passed to makepkg +$repack || rm -rf "$copydir"/build/* # Read .makepkg.conf even if called via sudo -if [ -n "${SUDO_USER}" ]; then - makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf" +if [[ -n $SUDO_USER ]]; then + makepkg_conf="$(eval echo ~$SUDO_USER)/.makepkg.conf" else - makepkg_conf="~/.makepkg.conf" + makepkg_conf="$HOME/.makepkg.conf" fi # Get SRC/PKGDEST from makepkg.conf -if [ -f "${makepkg_conf}" ]; then - eval $(grep '^SRCDEST=' "${makepkg_conf}") - eval $(grep '^PKGDEST=' "${makepkg_conf}") - - eval $(grep '^MAKEFLAGS=' "${makepkg_conf}") - eval $(grep '^PACKAGER=' "${makepkg_conf}") +if [[ -f $makepkg_conf ]]; then + eval $(grep '^SRCDEST=' "$makepkg_conf") + eval $(grep '^PKGDEST=' "$makepkg_conf") + eval $(grep '^MAKEFLAGS=' "$makepkg_conf") + eval $(grep '^PACKAGER=' "$makepkg_conf") fi -[ -z "${SRCDEST}" ] && eval $(grep '^SRCDEST=' /etc/makepkg.conf) -[ -z "${PKGDEST}" ] && eval $(grep '^PKGDEST=' /etc/makepkg.conf) -[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest" -if ! grep 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then +[[ -z $SRCDEST ]] && eval $(grep '^SRCDEST=' /etc/makepkg.conf) +[[ -z $PKGDEST ]] && eval $(grep '^PKGDEST=' /etc/makepkg.conf) +[[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf) +[[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf) + +# Use PKGBUILD directory if PKGDEST or SRCDEST don't exist +[[ -d $PKGDEST ]] || PKGDEST=. +[[ -d $SRCDEST ]] || SRCDEST=. + +mkdir -p "$copydir/pkgdest" +if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; then echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf" fi -[ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest" -if ! grep 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then +mkdir -p "$copydir/srcdest" +if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf" fi -[ -z "${MAKEFLAGS}" ] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf) -if [ -n "${MAKEFLAGS}" ]; then - sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf" - echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf" + +if [[ -n $MAKEFLAGS ]]; then + sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf" + echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf" fi -[ -z "${PACKAGER}" ] && eval $(grep '^PACKAGER=' /etc/makepkg.conf) -if [ -n "${PACKAGER}" ]; then - sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf" - echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf" + +if [[ -n $PACKAGER ]]; then + sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf" + echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf" fi # Set target CARCH as it might be used within the PKGBUILD to select correct sources eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf") export CARCH + # Copy PKGBUILD and sources -source=($(. PKGBUILD; echo ${source[@]})) cp PKGBUILD "$copydir/build/" -for f in ${source[@]}; do - basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g') - if [ -f "$basef" ]; then - cp "$basef" "$copydir/srcdest/" - elif [ -f "$SRCDEST/$basef" ]; then - cp "$SRCDEST/$basef" "$copydir/srcdest/" - fi -done - -( . PKGBUILD -for i in 'changelog' 'install'; do - filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) - for file in $filelist; do - # evaluate any bash variables used - eval file=${file} - if [[ -f "$file" ]]; then - cp "$file" "$copydir/build/" +( + source PKGBUILD + for file in "${source[@]}"; do + file="${file%%::*}" + file="${file##*://*/}" + if [[ -f $file ]]; then + cp "$file" "$copydir/srcdest/" + elif [[ -f $SRCDEST/$file ]]; then + cp "$SRCDEST/$file" "$copydir/srcdest/" fi done -done + + # Find all changelog and install files, even inside functions + for i in changelog install; do + sed -n "s/^[[:space:]]*$i=//p" PKGBUILD | while IFS= read -r file; do + # evaluate any bash variables used + eval file="$file" + [[ -f $file ]] && cp "$file" "$copydir/build/" + done + done ) -chown -R nobody "$copydir/build" -chown -R nobody "$copydir/srcdest" -chown -R nobody "$copydir/pkgdest" +chown -R nobody "$copydir"/{build,pkgdest,srcdest} echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman" chmod 440 "$copydir/etc/sudoers.d/nobody-pacman" -#This is a little gross, but this way the script is recreated every time in the -#working copy -(cat <<EOF +# This is a little gross, but this way the script is recreated every time in the +# working copy +cat >"$copydir/chrootbuild" <<EOF #!/bin/bash export LANG=C -cd /build export HOME=/build -sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED -[ -f BUILD_FAILED ] && exit 1 -which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log + +cd /build +sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED + +[[ -f BUILD_FAILED ]] && exit 1 + +if $run_namcap; then + pacman -S --needed --noconfirm namcap + namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log +fi + exit 0 EOF -) > "$copydir/chrootbuild" chmod +x "$copydir/chrootbuild" if mkarchroot -r "/chrootbuild" "$copydir"; then - for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do - [ -e "$pkgfile" ] || continue - if [ "$add_to_db" -eq "1" ]; then - mkdir -p "${copydir}/repo" - pushd "${copydir}/repo" >/dev/null + for pkgfile in "$copydir"/pkgdest/*.pkg.tar.*; do + if $add_to_db; then + mkdir -p "$copydir/repo" + pushd "$copydir/repo" >/dev/null cp "$pkgfile" . - repo-add repo.db.tar.gz "$(basename "$pkgfile")" + repo-add repo.db.tar.gz "${pkgfile##*/}" popd >/dev/null fi - if [ -d "$PKGDEST" ]; then - mv "$pkgfile" "${PKGDEST}" - else - mv "$pkgfile" "${WORKDIR}" - fi + mv "$pkgfile" "$PKGDEST" done - for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do - [ -f "$l" ] && mv "$l" "${WORKDIR}" + for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do + [[ -f $l ]] && mv "$l" . done else - #just in case. We returned 1, make sure we fail - touch "${copydir}/build/BUILD_FAILED" + # Just in case. We returned 1, make sure we fail + touch "$copydir/build/BUILD_FAILED" fi -for f in "${copydir}"/srcdest/*; do - [ -e "$f" ] || continue - if [ -d "$SRCDEST" ]; then - mv "$f" "${SRCDEST}" - else - mv "$f" "${WORKDIR}" - fi +for f in "$copydir"/srcdest/*; do + mv "$f" "$SRCDEST" done -if [ -e "${copydir}/build/BUILD_FAILED" ]; then +if [[ -e $copydir/build/BUILD_FAILED ]]; then echo "Build failed, check $copydir/build" - rm "${copydir}/build/BUILD_FAILED" + rm "$copydir/build/BUILD_FAILED" exit 1 fi diff --git a/mkarchroot b/mkarchroot.in index 8e74c54..8e74c54 100755..100644 --- a/mkarchroot +++ b/mkarchroot.in diff --git a/rebuildpkgs b/rebuildpkgs.in index be279bb..be279bb 100755..100644 --- a/rebuildpkgs +++ b/rebuildpkgs.in diff --git a/zsh_completion b/zsh_completion.in index d87850a..d87850a 100644 --- a/zsh_completion +++ b/zsh_completion.in |