diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-10 19:26:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-10 19:26:22 -0400 |
| commit | 4fcf9f8582cc78699b64884b872fe2578464c660 (patch) | |
| tree | fc397c3dc65e2b80bd93f71e95b27a0eb4ade96f | |
| parent | ead868c7fa430c647d52d746e515aecd0c3c0cae (diff) | |
Tidy up.
| -rw-r--r-- | lib/common.sh | 5 | ||||
| -rw-r--r-- | makechrootpkg.in | 8 | ||||
| -rw-r--r-- | rebuildpkgs.in | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/lib/common.sh b/lib/common.sh index 7f83bdd..44d12c3 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -137,7 +137,7 @@ get_full_version() { } ## -# usage : lock( $fd, $file, $message ) +# usage : lock( $fd, $file, $message, [ $message_arguments... ] ) ## lock() { local fd=$1 @@ -158,7 +158,7 @@ lock() { } ## -# usage : slock( $fd, $file, $message ) +# usage : slock( $fd, $file, $message, [ $message_arguments... ] ) ## slock() { local fd=$1 @@ -171,7 +171,6 @@ slock() { eval "exec $fd>"'"$file"' fi - eval "exec $fd>"'"$file"' if ! flock -sn $fd; then stat_busy "${mesg[@]}" flock -s $fd 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 diff --git a/rebuildpkgs.in b/rebuildpkgs.in index 65be0de..1a02954 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -49,7 +49,7 @@ pkgs="$@" SVNPATH='svn+ssh://nymeria.archlinux.org/srv/repos/svn-packages/svn' -msg "Work will be done in %s/rebuilds" "$(pwd)" +msg "Work will be done in %s" "$(pwd)/rebuilds" REBUILD_ROOT="$(pwd)/rebuilds" mkdir -p "$REBUILD_ROOT" |