diff options
Diffstat (limited to 'src/abslibre-tools')
| -rwxr-xr-x | src/abslibre-tools/createworkdir | 6 | ||||
| -rwxr-xr-x | src/abslibre-tools/librerelease | 2 | ||||
| -rwxr-xr-x | src/abslibre-tools/librestage | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir index 8e5ebcd..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 @@ -38,7 +38,7 @@ mkdir -p "$WORKDIR" msg "Creating staging directory in WORKDIR..." mkdir -p "$WORKDIR/staging" -cmd=(gitget -f -p "$ABSLIBRESEND" checkout "$ABSLIBRERECV" "$WORKDIR/abslibre") +cmd=(xbs -b abslibre download) if ! "${cmd[@]}"; then error "Could not clone ABSLibre" plain "Try running this command:" @@ -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) <hahj87@gmail.com> # Copyright (C) 2010-2013 Nicolás Reynolds <fauno@parabola.nu> 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 |