summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/abslibre-tools/libredbdiff61
-rwxr-xr-xsrc/abslibre-tools/librerelease2
-rw-r--r--src/chroot-tools/arch-nspawn.patch11
-rwxr-xr-xsrc/chroot-tools/libremakepkg2
-rwxr-xr-xsrc/fullpkg/fullpkg-build2
-rwxr-xr-xsrc/lib/libreblacklist2
-rwxr-xr-xsrc/xbs/xbs4
7 files changed, 39 insertions, 45 deletions
diff --git a/src/abslibre-tools/libredbdiff b/src/abslibre-tools/libredbdiff
index f87c579..1d1d191 100755
--- a/src/abslibre-tools/libredbdiff
+++ b/src/abslibre-tools/libredbdiff
@@ -60,10 +60,10 @@ downloadfile() {
if wget -q "$url" -O "$outfile"; then
return 255
else
- die "Failed to download %q. Exiting." "$outfile"
+ die "Failed to download %q. Exiting." "$outfile"
fi
elif [[ $init ]]; then
- warning "%q already exists. Skipping." "$outfile"
+ warning "%q already exists. Skipping." "$outfile"
fi
}
@@ -79,9 +79,9 @@ createdir() {
local dir=$1
if [[ ! -e $dir ]] ; then
msg "Creating directory %q" "$dir"
- mkdir -- "$1" || die "Failed to create directory %q. Exiting." "$dir"
+ mkdir -- "$1" || die "Failed to create directory %q. Exiting." "$dir"
elif [[ $init ]]; then
- warning "%q already exists. Skipping." "$dir"
+ warning "%q already exists. Skipping." "$dir"
fi
}
@@ -101,7 +101,7 @@ filenotfound() {
local file=$1
if [[ ! -r $1 ]]; then
error "Could not read %q." "$file"
- die "Nothing done. It may be necessary to run %q without \
+ die "Nothing done. It may be necessary to run %q without \
arguments as root to initialize %s." "$cmd" "$name"
fi
}
@@ -166,26 +166,22 @@ repo_test() {
fi
done
if [[ $found != 1 ]] ; then
- die "The specified Parabola repo \"%s\" cannot be compared. It's \
-not in the list of repos in the configuration variable \"repos\"." "$1"
+ die "The specified Parabola repo \"%s\" cannot be compared. It's not in the list of repos in the configuration variable \"repos\"." "$1"
fi
}
expac_version_test() {
if ! pkgname="$(pacman -Qoq expac 2> /dev/null)" ; then
- die "The command expac could not be found installed. The package \
-pcr/expac-relative 4-2.parabola1 (or later) must be installed."
+ die "The command expac could not be found installed. The package pcr/expac-relative 4-2.parabola1 (or later) must be installed."
elif [[ $pkgname == expac-git ]] ; then
true
elif [[ $pkgname == expac-relative ]] ; then
expac_ver="$(expac %v expac-relative)"
if [[ $(vercmp "${expac_ver}" 4-2.parabola1) == -1 ]] ; then
- die "The version of expac-relative installed on the system is \
-lower than needed."
+ die "The version of expac-relative installed on the system is lower than needed."
fi
else
- die "expac command must be provided by pcr/expac-relative version \
-4-2.parabola1 (or later). This package must be installed."
+ die "expac command must be provided by pcr/expac-relative version 4-2.parabola1 (or later). This package must be installed."
fi
}
@@ -240,8 +236,8 @@ usage() {
print "Usage: %q [-n|-h]" "$cmd"
print 'Show packages that need to be updated from Arch repositories.'
echo
- prose "Compares packages in Parabola repositories. Packages from
- all configured Parabola repositories are compared. A Parabola
+ prose "Compares packages in Parabola repositories. Packages from
+ all configured Parabola repositories are compared. A Parabola
repository name can be specified as argument to compare only
packages in that repository."
echo
@@ -290,8 +286,7 @@ main() {
if (( $UPDATE )) ; then
if [[ $EUID != 0 ]]; then
- die "To initialize %s or update %s pacman \
-databases, %s must be run as root (without arguments). Nothing done." \
+ die "To initialize %s or update %s pacman databases, %s must be run as root (without arguments). Nothing done." \
"$name" \
"$name" \
"$cmd"
@@ -301,11 +296,9 @@ databases, %s must be run as root (without arguments). Nothing done." \
-e "${conffilearch}" && \
-e "${mirrorlist}" && \
-e "${mirrorlist}" ]]; then
- warning "At least one %s configuration file is \
-missing." \
+ warning "At least one %s configuration file is missing." \
"${name}"
- msg "Downloading and preparing missing \
-configuration files."
+ msg "Downloading and preparing missing configuration files."
init=1
fi
@@ -316,22 +309,22 @@ configuration files."
if ! [[ -d "$dbpath" && \
-d "$dbpatharch" ]]; then
- warning "At least one %s pacman DB directory \
-is missing. Synchronizing %s DB files." "${name}" "${name}"
+ warning "At least one %s pacman DB directory is missing. Synchronizing %s DB files." \
+ "${name}" "${name}"
fi
createdir "$dbpath"
msg "Synchronizing %s pacman databases for Parabola" "$name"
- pacman --config "${conffile}" -Sy || \
- die "Failed to synchronize pacman database for Parabola. Exiting."
+ pacman --config "${conffile}" -Sy ||
+ die "Failed to synchronize pacman database for Parabola. Exiting."
createdir "$dbpatharch"
msg "Synchronizing %s pacman databases for Arch" "$name"
- pacman --config "${conffilearch}" -b "${dbpatharch}" -Sy || \
- die "Failed to synchronize pacman database for Arch. Exiting."
+ pacman --config "${conffilearch}" -b "${dbpatharch}" -Sy ||
+ die "Failed to synchronize pacman database for Arch. Exiting."
- msg "%s pacman databases are updated. %s is ready. Run %q -n to \
-print results." "$name" "$name" "$cmd"
+ msg "%s pacman databases are updated. %s is ready. Run %q -n to print results." \
+ "$name" "$name" "$cmd"
return 0
else
filenotfound "${dbpath}"
@@ -346,9 +339,7 @@ print results." "$name" "$name" "$cmd"
if ! [[ -d "$dbpath" && \
-d "$dbpatharch" ]]; then
- die "At least one %s pacman DB directory \
-is missing. To update %s pacman databases, %s must be run as root. \
-Nothing done." \
+ die "At least one %s pacman DB directory is missing. To update %s pacman databases, %s must be run as root. Nothing done." \
"$name" \
"$name" \
"$cmd"
@@ -360,8 +351,7 @@ Nothing done." \
grep -v '^ ' | \
awk -F/ '{print $2}' \
> ${arch_packages_tmp} || \
- die "pacman command to get Arch \
-package data has failed. Exiting."
+ die "pacman command to get Arch package data has failed. Exiting."
chmod 777 ${arch_packages_tmp}
while read -a line; do
@@ -370,8 +360,7 @@ package data has failed. Exiting."
expac --config "${conffile}" -S '%r/%n %v %S' \
> ${parabola_packages_tmp} || \
- die "expac command to get Parabola \
-package data has failed. Exiting."
+ die "expac command to get Parabola package data has failed. Exiting."
chmod 777 ${parabola_packages_tmp}
if [[ ${repo_arg} ]] ; then
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index fef155a..b7a77d3 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -93,7 +93,7 @@ sign_packages() {
# Verify that the signature is correct, else remove for re-signing
if ! gpg --quiet --verify "${file}.sig" >/dev/null 2>&1; then
- error "Failed! Re-signing..."
+ error "Failed! Re-signing..."
rm -f "${file}.sig"
fi
fi
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch
index e387335..6b32f2b 100644
--- a/src/chroot-tools/arch-nspawn.patch
+++ b/src/chroot-tools/arch-nspawn.patch
@@ -1,5 +1,5 @@
---- arch-nspawn.in 2015-01-04 16:32:42.463202960 -0500
-+++ arch-nspawn.ugly 2015-01-05 14:51:34.678625475 -0500
+--- arch-nspawn.in 2015-05-24 19:32:57.117177433 -0600
++++ arch-nspawn.ugly 2015-05-24 23:40:04.031482147 -0600
@@ -1,4 +1,6 @@
#!/bin/bash
+# License: GNU GPLv2
@@ -7,7 +7,12 @@
# 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.
-@@ -92,6 +94,7 @@
+@@ -88,10 +90,11 @@
+ if [[ ! -f "$working_dir/.arch-chroot" ]]; then
+ die "'%s' does not appear to be an Arch chroot." "$working_dir"
+ elif [[ $(cat "$working_dir/.arch-chroot") != $CHROOT_VERSION ]]; then
+- die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
++ die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
fi
build_mount_args
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index c3d5650..767dff8 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -159,7 +159,7 @@ usage() {
flag "-r <$(_ 'PATH[:PATH]')>" 'Bind mount a file or directory, read-only'
print ' %s options:' libremakepkg
flag '-N' "Don't disable networking during build() and
- package(). PLEASE don't use this unless you
+ package(). PLEASE don't use this unless you
have a special reason, its use is a violation
of Parabola policy."
flag '-R' 'Repackage contents of the package without rebuilding'
diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build
index 9a1dcf1..97da33f 100755
--- a/src/fullpkg/fullpkg-build
+++ b/src/fullpkg/fullpkg-build
@@ -176,7 +176,7 @@ build_dir="${1:-`pwd`}"
buildorder="${build_dir}/BUILDORDER"
if [[ ! -e "$buildorder" ]]; then
- error "This is not a build_dir. Make one using fullpkg."
+ error "This is not a build_dir. Make one using fullpkg."
usage
exit 1
else
diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist
index 5eaec4e..1e5a467 100755
--- a/src/lib/libreblacklist
+++ b/src/lib/libreblacklist
@@ -30,7 +30,7 @@ blacklist-normalize() {
# Usage: blacklist-cat
# Prints the blacklist.
-# Uses the cache, but downloads it if it doesn't exist. Also normalizes the blacklist for easier parsing.
+# Uses the cache, but downloads it if it doesn't exist. Also normalizes the blacklist for easier parsing.
blacklist-cat() {
local file="$XDG_CACHE_HOME/libretools/blacklist.txt"
if ! [[ -e $file ]]; then
diff --git a/src/xbs/xbs b/src/xbs/xbs
index c42738d..6319110 100755
--- a/src/xbs/xbs
+++ b/src/xbs/xbs
@@ -34,8 +34,8 @@ usage() {
print 'Usage: %s [-b BUILDSYSTEM|-h] COMMAND [ARGUMENTS]' "${0##*/}"
print 'Tool for working with arbitrary ABS-like build systems'
echo
- prose 'This is a pluggable tool. The BUILDSYSTEM it uses is configured
- in:'
+ prose 'This is a pluggable tool. The BUILDSYSTEM it uses is
+ configured in:'
bullet '/etc/xbs.conf'
bullet '${XDG_CONFIG_HOME}/xbs.conf'
bullet 'with the `-b` flag'