From e7e4b02c042f7549d7f9767f7cc9040f6651b6c8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 17 Jun 2014 11:46:54 -0400 Subject: minor touch ups in abslibre-tools --- src/abslibre-tools/createworkdir | 4 ++-- src/abslibre-tools/librerelease | 2 +- src/abslibre-tools/librestage | 8 ++++---- src/libretools.conf | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir index 51b66a7..8176cce 100755 --- a/src/abslibre-tools/createworkdir +++ b/src/abslibre-tools/createworkdir @@ -28,7 +28,7 @@ set -euE . libremessages . $(librelib conf.sh) load_files libretools -check_vars libretools WORKDIR REPOS ABSLIBRERECV ABSLIBRESEND +check_vars libretools WORKDIR ABSLIBRERECV ABSLIBRESEND # these are asked for by `xbs download` trap 'error "Aborting..."' EXIT @@ -49,6 +49,6 @@ if ! "${cmd[@]}"; then fi msg "Finished, your packaging directory tree looks like this now:" -ls --color=always "${WORKDIR}"/* +ls --color=auto "${WORKDIR}"/* trap -- EXIT diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 03a57e0..e3869e9 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Librerelease -# Uploads packages into [staging] +# Uploads packages and releases them # Copyright (C) 2010-2012 Joshua Ismael Haase Hernández (xihh) # Copyright (C) 2010-2013 Nicolás Reynolds diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 1e208c9..d566fa9 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -37,7 +37,7 @@ usage() { main() { if [[ -w / ]]; then - error "This program should be run as regular user" + error "This program should be run as a regular user" return 1 fi @@ -51,13 +51,13 @@ main() { repos=("$@") if [[ ${#repos[@]} -eq 0 ]]; then usage >&2 - return 1; + return 1 fi - [[ ! -e ./PKGBUILD ]] && { + if ! [[ -e ./PKGBUILD ]]; then error "PKGBUILD not found" return 1 - } + fi # Load configuration load_files libretools diff --git a/src/libretools.conf b/src/libretools.conf index 12c4392..3999849 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -15,7 +15,7 @@ BLACKLIST=https://repo.parabolagnulinux.org/docs/blacklist.txt DIFFPROG=`which kdiff3 meld gvimdiff vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q'` ## The repos you'll be packaging for -## Used by `toru`, `createworkdir` +## Used by `toru` # Tip: As early repos take precedence on $REPOS loops, you can use this as # inverted order of precedence. Put testing repos first so fullpkg find new # PKGBUILDs first, for instance. Toru-path uses reverse order to enforce repo -- cgit v1.2.2