diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-05-31 23:02:52 -0600 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-05 19:53:20 -0600 |
commit | 47722999c8cb00e6f0be036aa8b620fcd0ca861c (patch) | |
tree | f8a0821c93cc7c90aa01c814c463c207dc49574c | |
parent | d0665ee79d9e7dad960cfd7166987905d191bf80 (diff) |
[many tools]: miscellaneous minor cleanups
-rwxr-xr-x | src/abslibre-tools/librerelease | 2 | ||||
-rwxr-xr-x | src/abslibre-tools/librestage | 4 | ||||
-rwxr-xr-x | src/toru/toru | 2 | ||||
-rwxr-xr-x | src/toru/toru-path | 2 | ||||
-rwxr-xr-x | src/treepkg | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 265550f..4296bb1 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -66,7 +66,7 @@ function sign_packages { warning "Package signature found, verifying..." -# Verify that the signature is correct, else remove for re-signing + # Verify that the signature is correct, else remove for re-signing if ! gpg --quiet --verify "${package}${SIGEXT}" >/dev/null 2>&1; then error "Failed! Resigning..." rm -f "${package}${SIGEXT}" diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index c0936cc..e84c486 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -81,8 +81,8 @@ PKGEXT=".pkg.tar.?z" staged=false # Copies the packages to the specified repos inside staging -for _arch in ${ARCHES[@]}; do - for pkg in ${pkgname[@]}; do +for _arch in "${ARCHES[@]}"; do + for pkg in "${pkgname[@]}"; do pkgpath=$(find ${PKGDEST}/ -type f \ -name "${pkg}-$(get_full_version "${pkg}")-${_arch}${PKGEXT}") diff --git a/src/toru/toru b/src/toru/toru index 28f0b8a..5faa2f4 100755 --- a/src/toru/toru +++ b/src/toru/toru @@ -12,7 +12,7 @@ # * Possibility to hook up ABS dirs besides ABSROOT (low priority) # * Tell updates and non available binary packages (working on this) -source $(dirname $(command -v $0))/toru-utils +source toru-utils # Saves contents on a named cache # $1 cache name (repo) diff --git a/src/toru/toru-path b/src/toru/toru-path index baeaeb5..3f35dbe 100755 --- a/src/toru/toru-path +++ b/src/toru/toru-path @@ -1,6 +1,6 @@ #!/bin/bash -source $(dirname $(command -v $0))/toru-utils +source toru-utils TORUPATH=${T:-${TORUPATH}} VERBOSE=${V:-false} diff --git a/src/treepkg b/src/treepkg index 22485d2..1796748 100755 --- a/src/treepkg +++ b/src/treepkg @@ -107,7 +107,7 @@ unset pkgdesc arch license groups backup install md5sums sha1sums \ unset build package >/dev/null 2>&1 -for _pkg in ${pkgname[@]}; do +for _pkg in "${pkgname[@]}"; do unset package_${_pkg} >/dev/null 2>&1 || true done ## @@ -138,7 +138,7 @@ if ! ${BUILDNOW}; then touch "${BUILDORDER}" # If this package is already built quit silently - for _pkg in ${pkgname[@]}; do + for _pkg in "${pkgname[@]}"; do if is_built "${_pkg}" "${fullver}"; then add_order "ignore" exit 0 @@ -162,7 +162,7 @@ if ! ${BUILDNOW}; then sort -u)) # NOTE: getting depends from package() is a PITA - for _dep in ${deps[@]}; do + for _dep in "${deps[@]}"; do # Move deps deeper in the tree if # pkgbase - dep1 # \ dep2 - dep1 |