- Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH 4/7] mkarchroot, arch-nspawn: Add an `-f` flag to add files to copy.
by lukeshu＠lukeshu.com 05 Apr '17

05 Apr '17

From: Luke Shumaker <lukeshu(a)parabola.nu> This allows us to copy in files like `qemu-arm-static`, which is necessary for running an ARM chroot on an x86 box. --- arch-nspawn.in | 12 +++++++++++- mkarchroot.in | 11 ++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 7481d82..dceb3ed 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -15,6 +15,8 @@ m4_include(lib/archroot.sh) working_dir='' +files=() + usage() { echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]" echo "A wrapper around systemd-nspawn. Provides support for pacman." @@ -23,15 +25,17 @@ usage() { echo ' -C <file> Location of a pacman config file' echo ' -M <file> Location of a makepkg config file' echo ' -c <dir> Set pacman cache' + echo ' -f <file> Copy file from the host to the chroot' echo ' -h This message' exit 1 } -while getopts 'hC:M:c:' arg; do +while getopts 'hC:M:c:f:' arg; do case "$arg" in C) pac_conf="$OPTARG" ;; M) makepkg_conf="$OPTARG" ;; c) cache_dir="$OPTARG" ;; + f) files+=("$OPTARG") ;; h|?) usage ;; *) error "invalid argument '%s'" "$arg"; usage ;; esac @@ -77,6 +81,12 @@ copy_hostconf () { [[ -n $pac_conf ]] && cp $pac_conf "$working_dir/etc/pacman.conf" [[ -n $makepkg_conf ]] && cp $makepkg_conf "$working_dir/etc/makepkg.conf" + local file + for file in "${files[@]}"; do + mkdir -p "$(dirname "$working_dir$file")" + cp -T "$file" "$working_dir$file" + done + sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$working_dir/etc/pacman.conf" } # }}} diff --git a/mkarchroot.in b/mkarchroot.in index 1265335..4f35c1a 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -15,21 +15,25 @@ m4_include(lib/archroot.sh) working_dir='' +files=() + usage() { echo "Usage: ${0##*/} [options] working-dir package-list..." echo ' options:' echo ' -C <file> Location of a pacman config file' echo ' -M <file> Location of a makepkg config file' echo ' -c <dir> Set pacman cache' + echo ' -f <file> Copy file from the host to the chroot' echo ' -h This message' exit 1 } -while getopts 'hC:M:c:' arg; do +while getopts 'hC:M:c:f:' arg; do case "$arg" in C) pac_conf="$OPTARG" ;; M) makepkg_conf="$OPTARG" ;; c) cache_dir="$OPTARG" ;; + f) files+=("$OPTARG") ;; h|?) usage ;; *) error "invalid argument '%s'" "$arg"; usage ;; esac @@ -67,6 +71,11 @@ if is_btrfs "$working_dir"; then chmod 0755 "$working_dir" fi +for file in "${files[@]}"; do + mkdir -p "$(dirname "$working_dir$file")" + cp "$file" "$working_dir$file" +done + pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' -- 2.12.1

1 0

[arch-projects] [devtools] [PATCH 3/7] makechrootpkg: Adjust to have the functions work with `set -u`.
by lukeshu＠lukeshu.com 05 Apr '17

05 Apr '17

From: Luke Shumaker <lukeshu(a)parabola.nu> Even though main() doesn't call `set -u`; this way the functions will continue to work if copied into an environment with `set -u`, or so that we are ready if we ever want to start using `set -u`. --- makechrootpkg.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index bdcaa88..f22fe49 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -32,7 +32,7 @@ bindmounts_ro=() bindmounts_rw=() copy=$USER -[[ -n $SUDO_USER ]] && copy=$SUDO_USER +[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER [[ -z "$copy" || $copy = root ]] && copy=copy src_owner=${SUDO_USER:-$USER} @@ -90,7 +90,7 @@ load_vars() { [[ -f $makepkg_conf ]] || return 1 for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do - [[ -z ${!var} ]] && eval $(grep "^${var}=" "$makepkg_conf") + [[ -z ${!var:-} ]] && eval $(grep "^${var}=" "$makepkg_conf") done return 0 @@ -209,7 +209,7 @@ prepare_chroot() { sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf" for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \ - "MAKEFLAGS='$MAKEFLAGS'" "PACKAGER='$PACKAGER'" + "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'" do grep -q "^$x" "$copydir/etc/makepkg.conf" && continue echo "$x" >>"$copydir/etc/makepkg.conf" @@ -384,7 +384,7 @@ $update_first && arch-nspawn "$copydir" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ pacman -Syu --noconfirm -if [[ -n ${install_pkgs[*]} ]]; then +if [[ -n ${install_pkgs[*]:-} ]]; then install_packages "$copydir" "${install_pkgs[@]}" ret=$? # If there is no PKGBUILD we have done -- 2.12.1

1 0

[arch-projects] [devtools] [PATCH 2/7] makechrootpkg: Have functions be more function-y.
by lukeshu＠lukeshu.com 05 Apr '17

05 Apr '17

From: Luke Shumaker <lukeshu(a)parabola.nu> Rather than them simply being named blocks of code with braces around them. That is: have them take things via arguments rather than global variables. Specific notes: - create_chroot->sync_chroot: I pulled out locking the destination chroot; getting that lock is now the caller's responsibility. It still handles locking the source chroot though. I pulled the `if [[ ! -d $copydir ]] || $clean_first;` check out; it is now the caller's responsibility to use that check when deciding if to call sync_chroot. However, when pulling that check out, I left it as `if true;`, to keep an indentation level. This patch has had to be rebased/merged many times, and changing the indentation is a sure way to make that go less smoothly; I'm not going to re-indent this block until I see the check removed in the git.archlinux.org/devtools.git repository. - install_packages: 1. Receive the list of packages as arguments, rather than a global variable. 2. Make the caller responsible for looking at PKGBUILD. From the name and arguments, one would never expect it to look at PKGBUILD. --- makechrootpkg.in | 88 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 13 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 5329f76..bdcaa88 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -76,6 +76,14 @@ usage() { } # {{{ functions +# Usage: load_vars $makepkg_conf +# Globals: +# - SRCDEST +# - SRCPKGDEST +# - PKGDEST +# - LOGDEST +# - MAKEFLAGS +# - PACKAGER load_vars() { local makepkg_conf="$1" var @@ -88,11 +96,23 @@ load_vars() { return 0 } -create_chroot() { - # Lock the chroot we want to use. We'll keep this lock until we exit. - lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy" +# Usage: sync_chroot $CHROOTDIR/$CHROOT <$CHROOTCOPY|$copydir> +sync_chroot() { + local chrootdir=$1 + local copy=$2 + local copydir='' + if [[ ${copy:0:1} = / ]]; then + copydir=$copy + else + copydir="$chrootdir/$copy" + fi + + if [[ "$chrootdir/root" -ef "$copydir" ]]; then + error 'Cannot sync copy with itself: %s' "$copydir" + return 1 + fi - if [[ ! -d $copydir ]] || $clean_first; then + if true; then # indent for rebasing/merging purposes # Get a read lock on the root chroot to make # sure we don't clone a half-updated chroot slock 8 "$chrootdir/root.lock" "Locking clean chroot" @@ -117,7 +137,11 @@ create_chroot() { touch "$copydir" } -clean_temporary() { +# Usage: delete_chroot $copydir [$copy] +delete_chroot() { + local copydir=$1 + local copy=${1:-$2} + stat_busy "Removing temporary copy [%s]" "$copy" if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then btrfs subvolume delete "$copydir" >/dev/null || @@ -133,7 +157,11 @@ clean_temporary() { stat_done } +# Usage: install_packages $copydir $pkgs... install_packages() { + local copydir=$1 + local install_pkgs=("${@:2}") + local -a pkgnames local ret @@ -145,11 +173,19 @@ install_packages() { ret=$? rm -- "${pkgnames[@]/#/$copydir/root/}" - # If there is no PKGBUILD we are done - [[ -f PKGBUILD ]] || exit $ret + return $ret } +# Usage: prepare_chroot $copydir $HOME $repack $run_namcap +# Globals: +# - MAKEFLAGS +# - PACKAGER prepare_chroot() { + local copydir=$1 + local USER_HOME=$2 + local repack=$3 + local run_namcap=$4 + $repack || rm -rf "$copydir/build" local builduser_uid="${SUDO_UID:-$UID}" @@ -216,7 +252,14 @@ _chrootnamcap() { done } +# Usage: download_sources $copydir $src_owner +# Globals: +# - SRCDEST +# - USER download_sources() { + local copydir=$1 + local src_owner=$2 + local builddir="$(mktemp -d)" chmod 1777 "$builddir" @@ -235,7 +278,15 @@ download_sources() { rm -rf $builddir } +# Usage: move_products $copydir $owner +# Globals: +# - PKGDEST +# - LOGDEST move_products() { + local copydir=$1 + local src_owner=$2 + + local pkgfile for pkgfile in "$copydir"/pkgdest/*; do chown "$src_owner" "$pkgfile" mv "$pkgfile" "$PKGDEST" @@ -246,6 +297,7 @@ move_products() { fi done + local l for l in "$copydir"/logdest/*; do [[ $l == */logpipe.* ]] && continue chown "$src_owner" "$l" @@ -321,17 +373,27 @@ load_vars /etc/makepkg.conf [[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD [[ -d $LOGDEST ]] || LOGDEST=$PWD -create_chroot +# Lock the chroot we want to use. We'll keep this lock until we exit. +lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy" + +if [[ ! -d $copydir ]] || $clean_first; then + sync_chroot "$chrootdir" "$copy" +fi $update_first && arch-nspawn "$copydir" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ pacman -Syu --noconfirm -[[ -n ${install_pkgs[*]} ]] && install_packages +if [[ -n ${install_pkgs[*]} ]]; then + install_packages "$copydir" "${install_pkgs[@]}" + ret=$? + # If there is no PKGBUILD we have done + [[ -f PKGBUILD ]] || return $ret +fi -download_sources +download_sources "$copydir" "$src_owner" -prepare_chroot +prepare_chroot "$copydir" "$USER_HOME" "$repack" if arch-nspawn "$copydir" \ --bind="$PWD:/startdir" \ @@ -339,12 +401,12 @@ if arch-nspawn "$copydir" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ /chrootbuild then - move_products + move_products "$copydir" "$src_owner" else (( ret += 1 )) fi -$temp_chroot && clean_temporary +$temp_chroot && delete_chroot "$copydir" "$copy" if (( ret != 0 )); then if $temp_chroot; then -- 2.12.1

1 0

[arch-projects] [devtools] [PATCH 1/7] Handle makepkg.conf more consistently
by lukeshu＠lukeshu.com 05 Apr '17

05 Apr '17

From: Luke Shumaker <lukeshu(a)parabola.nu> - checkpkg: Check ~/.config/pacman/makepkg.conf ; not just ~/.makepkg.conf - commitpkg: Likewise - rebuildpkgs: Check for user makepkg.conf files, not just the system one in /etc --- checkpkg.in | 6 ++++-- commitpkg.in | 6 ++++-- rebuildpkgs.in | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index fbd30d3..ec58ff6 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -13,8 +13,10 @@ else fi # Source user-specific makepkg.conf overrides -if [[ -r ~/.makepkg.conf ]]; then - source ~/.makepkg.conf +if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then + source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" +elif [[ -r "$HOME/.makepkg.conf" ]]; then + source "$HOME/.makepkg.conf" fi if [[ ! -f PKGBUILD ]]; then diff --git a/commitpkg.in b/commitpkg.in index d31f6ba..1f9492c 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -11,8 +11,10 @@ else fi # Source user-specific makepkg.conf overrides -if [[ -r ~/.makepkg.conf ]]; then - . ~/.makepkg.conf +if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then + source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" +elif [[ -r "$HOME/.makepkg.conf" ]]; then + source "$HOME/.makepkg.conf" fi cmd=${0##*/} diff --git a/rebuildpkgs.in b/rebuildpkgs.in index 8a141e0..9197231 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -26,6 +26,13 @@ else die '/etc/makepkg.conf not found!' fi +# Source user-specific makepkg.conf overrides +if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then + source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" +elif [[ -r "$HOME/.makepkg.conf" ]]; then + source "$HOME/.makepkg.conf" +fi + bump_pkgrel() { # Get the current pkgrel from SVN and update the working copy with it # This prevents us from incrementing out of control :) -- 2.12.1

1 0

[arch-projects] [devtools] Minor fix, and cleanups from Parabola
by lukeshu＠lukeshu.com 05 Apr '17

05 Apr '17

Hi, Here's another batch of changes backported from Parabola's version of devtools. These changes should be pretty uncontroversial. This patchset applies cleanly if applied over the patchsets I've already submitted. It shouldn't be any real trouble to apply them without applying the previous patches, but the context of the diffs has changed enough that it would require resolution of "conflicts". Let me know if you want me to resubmit them with a different base. The first 3 commits deal with strings the user sees; most significantly: fix a bug where makechrootpkg's usage text could be tricked into lying about default values. The next 3 are general code quality improvements to makechrootpkg; they shouldn't actually change anything. The last 2 let common.sh be used in new ways... even if it isn't used those ways in devtools. Let it be included multiple times (like a C header), and let it be used in scripts that `set -u`. -- Happy hacking, ~ Luke Shumaker

4 11

[arch-projects] [namcap][PATCH] Remove out of date rules section
by Justin Vreeland 04 Apr '17

04 Apr '17

The differences between namcap --list and namcap(1) are confusing. Since FS#38562 already floats the idea of removing it, and --list uses python docstrings it seems to make sense to remove the RULES section. Signed-off-by: Justin Vreeland <justin(a)jvreeland.com> --- namcap.1 | 96 ---------------------------------------------------------------- 1 file changed, 96 deletions(-) diff --git a/namcap.1 b/namcap.1 index 28b3e6d..ef33860 100644 --- a/namcap.1 +++ b/namcap.1 @@ -29,102 +29,6 @@ RULELIST is a comma-separated list of rule names .TP .B "\-v, \-\-version" print version and exit -.SH RULES -.TP -.B arrays -Verifies that array variables are actually arrays and not strings -.TP -.B badbackups -Verifies that backup entries don't begin with / -.TP -.B carch -Looks for references to i686 and i586 and tells you to use $CARCH instead -.TP -.B capsnames -Checks a PKGBUILD to verify that the package name has no upper case characters -.TP -.B capsnamespkg -Checks a package to verify that the package name has no upper case characters -.TP -.B checksums -Makes sure that a PKGBUILD includes valid checksums -.TP -.B depends -This module runs ldd on all executables, gets the link-level dependencies, finds the smallest subset of dependencies that cover the link-level dependencies, and compares that list to the depends of the package. It returns messages in three cases: dependency detected and not included, dependency included but already satisfied, and dependency included and not needed. These suggestions are just guidelines and all package builders should take this into account (i.e. you're smarter than namcap is) - -Some cases where namcap fails are dlopen() and obscure links. dlopen()'d libraries don't show up because they are loaded at run time: in the case of a program that loads plugins. Obscure links are the cases where only a small portion of the package needs something to run; usually, the small portion won't be accessed unless that thing is installed (i.e. a java plugin for mozilla included in the java package). -.TP -.B directoryname -Checks the directory names in the package file list for standard directories (i.e. /etc, /usr/bin, /usr/lib). All files in directories that are non-standard are returned -.TP -.B elffiles -Gives an error if it finds ELF (binary) files outside the standard paths (/bin, /usr/bin, etc.) -.TP -.B emptydir -Looks for directories in a package that don't contain any files -.TP -.B extravars -Verifies that extra variables start with an underscore -.TP -.B fhsinfopages -Verifies correct installation of info pages -.TP -.B fhsmanpages -Verifies correct installation of man pages -.TP -.B fileownership -Verifies that all files are owned by root:root and not some other user or group -.TP -.B gnomemime -Checks for generated GNOME mime files -.TP -.B hicoloricons -Checks whether the hicolor icon cache is updated when a package installs -files in /usr/share/icons/hicolor -.TP -.B infodirectory -Verifies that a package does not contain the info directory file (/usr/share/info/dir) -.TP -.B invalidstartdir -Any PKGBUILDs that refer to files in $startdir are incorrect -.TP -.B libtool -Warns if libtool (*.la) files are present -.TP -.B license -Verifies that the licenses variable has been filled in in a PKGBUILD. -.TP -.B licensepkg -Verifies that the licenses variable has been filled in in a package. For packages with a custom license it -checks whether the license file has been installed in -/usr/share/licenses/$pkgname/ -.TP -.B perllocal -Searches for perllocal.pod. perllocal.pod is a nasty file that's included during most perl module installations -.TP -.B permissions -Checks basic file and and directory permissions. It returns warnings about world readable bits not being set, world writable bits being set, and world executable bit not being set for directories -.TP -.B rpath -Gives an error if a binary has RPATH set to something other than /usr/lib -.TP -.B scrollkeeper -Verifies that there aren't any scrollkeeper directories -.TP -.B sfurl -Warns if a PKGBUILD is downloading from a specific sourceforge mirror instead of the generic downloads.sourceforge.net -.TP -.B symlink -Finds out symbolic and hard links which do not point to a valid path in the package -.TP -.B tags -For package maintainers, this module verifies that we have remembered to add a Maintainer and Contributor comment. -.TP -.B url -Verifies that we have the url variable set in the PKGBUILD -.TP -.B urlpkg -Verifies that we have the url variable set in the package file .SH EXAMPLES .TP .B namcap foo.pkg.tar.gz -- 2.12.2

1 0

[arch-projects] [devtools] [PATCH] Add a "License:" tag to all code files.
by Luke Shumaker 28 Mar '17

28 Mar '17

In cases where there is no license specified, the file is tagged as "License: Unspecified". Obviously, that is not ideal, but it highlights the fact, and I hope that it encourages whoever has the authority to specify the license to do so. On that note, to anyone who may have the authority to specify the license of files in devtools: the current licence of many files is GPLv2 with no option for later versions; I impore you to re-license them to have the "or any later version" option. --- arch-nspawn.in | 2 ++ archbuild.in | 1 + archco.in | 1 + archrelease.in | 1 + archrm.in | 1 + bash_completion.in | 1 + checkpkg.in | 1 + commitpkg.in | 1 + crossrepomove.in | 1 + find-libdeps.in | 1 + finddeps.in | 1 + lddd.in | 1 + lib/archroot.sh | 1 + lib/common.sh | 2 ++ lib/valid-tags.sh | 1 + makechrootpkg.in | 2 ++ mkarchroot.in | 2 ++ rebuildpkgs.in | 2 ++ zsh_completion.in | 1 + 19 files changed, 24 insertions(+) diff --git a/arch-nspawn.in b/arch-nspawn.in index 5d5620d..9787415 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. diff --git a/archbuild.in b/archbuild.in index 4d1b351..bb2577d 100644 --- a/archbuild.in +++ b/archbuild.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/archco.in b/archco.in index 2a58921..6088b8e 100644 --- a/archco.in +++ b/archco.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified m4_include(lib/common.sh) diff --git a/archrelease.in b/archrelease.in index 6f52dbc..c56367f 100644 --- a/archrelease.in +++ b/archrelease.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified m4_include(lib/common.sh) m4_include(lib/valid-tags.sh) diff --git a/archrm.in b/archrm.in index 7c7139b..3173131 100644 --- a/archrm.in +++ b/archrm.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified m4_include(lib/common.sh) diff --git a/bash_completion.in b/bash_completion.in index 10dad36..f5a3077 100644 --- a/bash_completion.in +++ b/bash_completion.in @@ -1,4 +1,5 @@ #!/hint/bash +# License: Unspecified _devtools_compgen() { local i r diff --git a/checkpkg.in b/checkpkg.in index 467ac74..da69df2 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified shopt -s extglob diff --git a/commitpkg.in b/commitpkg.in index 707a81c..6cf562f 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified m4_include(lib/common.sh) diff --git a/crossrepomove.in b/crossrepomove.in index d0964e3..0d1945c 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified m4_include(lib/common.sh) diff --git a/find-libdeps.in b/find-libdeps.in index b40f794..5c350a9 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -1,4 +1,5 @@ #!/bin/bash +# License: Unspecified m4_include(lib/common.sh) diff --git a/finddeps.in b/finddeps.in index 7a2a3fb..89ccc41 100644 --- a/finddeps.in +++ b/finddeps.in @@ -2,6 +2,7 @@ # # finddeps - find packages that depend on a given depname # +# License: Unspecified m4_include(lib/common.sh) diff --git a/lddd.in b/lddd.in index 43aa8c1..663d8ae 100644 --- a/lddd.in +++ b/lddd.in @@ -2,6 +2,7 @@ # # lddd - find broken library links on your machine # +# License: Unspecified m4_include(lib/common.sh) diff --git a/lib/archroot.sh b/lib/archroot.sh index d8d4a2e..46d4963 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -1,4 +1,5 @@ #!/hint/bash +# License: Unspecified CHROOT_VERSION='v4' diff --git a/lib/common.sh b/lib/common.sh index e64553b..9303e2e 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -1,5 +1,7 @@ #!/hint/bash +# License: Unspecified + # Avoid any encoding problems export LANG=C diff --git a/lib/valid-tags.sh b/lib/valid-tags.sh index 9491b0a..e0a3b7c 100644 --- a/lib/valid-tags.sh +++ b/lib/valid-tags.sh @@ -1,4 +1,5 @@ #!/hint/bash +# License: Unspecified _arch=( i686 diff --git a/makechrootpkg.in b/makechrootpkg.in index ad99334..890a359 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. diff --git a/mkarchroot.in b/mkarchroot.in index 3d7e396..21a7727 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. diff --git a/rebuildpkgs.in b/rebuildpkgs.in index fb19258..75e7de0 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -1,4 +1,6 @@ #!/bin/bash +# License: Unspecified +# # This script rebuilds a list of packages in order # and reports anything that fails # diff --git a/zsh_completion.in b/zsh_completion.in index 4c6dd99..0f95a4c 100644 --- a/zsh_completion.in +++ b/zsh_completion.in @@ -1,4 +1,5 @@ #compdef archbuild archco arch-nspawn archrelease archrm commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-i686-build=archbuild extra-x86_64-build=archbuild testing-i686-build=archbuild testing-x86_64-build=archbuild staging-i686-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-i686-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-i686-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco +# License: Unspecified m4_include(lib/valid-tags.sh) -- 2.12.0

1 0

[arch-projects] [devtools] Help text editors out a bit
by Luke Shumaker 28 Mar '17

28 Mar '17

This pair of patches helps text editor programs when editing the files. For non-executable bash files, a phony shebang "#!/hint/bash" provides a hint to text editors that the shell dialect for that file is Bash; and is general that basically every text editor will understand it, unlike most other editor hints; without misleading a user into thinking that maybe the file is executable, like "#!/bin/bash" would. `commitpkg` had a line with a bunch of complex quoting and backslashes; it was confusing Emacs, and caused the rest of the file to be a string, wcrwing up syntax highlighting, but more importantly, auto-indentation. -- Happy hacking, ~ Luke Shumaker

1 2

[arch-projects] [devtools] Minor cleanups of common.sh
by Luke Shumaker 25 Mar '17

25 Mar '17

I'm the maintainer of the equivalent of devtools in Parabola, and I realized that most of the changes we apply have never been pushed upstream. So I'm doing that now. This is a set of minor improvements to common.sh that I hope are fairly uncontroversial; even if they aren't directly taken advantage of right now in devtools. In the coming days, I will be sending more patches as I isolate out many years of `git merge`s into sets of atomic commits that I think you might welcome. -- Happy hacking, ~ Luke Shumaker

2 5

[arch-projects] [devtools] [PATCH 1/4] lib/common.sh: add 'lock_close'; use it as appropriate.
by Luke Shumaker 25 Mar '17

25 Mar '17

`lock_close FD` is easier to remember than 'exec FD>&-`; and is especially easier if FD is a variable (though that isn't actually taken advantage of here). This uses Bash 4.1+ `exec {var}>&-`, rather than the clunkier `eval exec "$var>&-"` that was necessary in older versions of Bash. Thanks to Dave Reisner for pointing this new bit of syntax out to me the last time I submitted this (back in 2014, 4.1 had just come out). --- archbuild.in | 2 +- lib/common.sh | 8 ++++++++ makechrootpkg.in | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/archbuild.in b/archbuild.in index a78353c..4d1b351 100644 --- a/archbuild.in +++ b/archbuild.in @@ -55,7 +55,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then subvolume_delete_recursive "${copy}" rm -rf --one-file-system "${copy}" done - exec 9>&- + lock_close 9 rm -rf --one-file-system "${chroots}/${repo}-${arch}" mkdir -p "${chroots}/${repo}-${arch}" diff --git a/lib/common.sh b/lib/common.sh index 599be54..689772f 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -159,6 +159,14 @@ slock() { } ## +# usage : lock_close( $fd ) +## +lock_close() { + local fd=$1 + exec {fd}>&- +} + +## # usage: pkgver_equal( $pkgver1, $pkgver2 ) ## pkgver_equal() { diff --git a/makechrootpkg.in b/makechrootpkg.in index dc598f7..ad99334 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -108,7 +108,7 @@ create_chroot() { stat_done # Drop the read lock again - exec 8>&- + lock_close 8 fi # Update mtime -- 2.12.0

1 0