aboutsummaryrefslogtreecommitdiff
path: root/tools/dependencies
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2019-02-19 15:21:51 -0500
committerAndrew Robbins <contact@andrewrobbins.info>2019-02-22 13:03:57 -0500
commita9d094a7d1faac6ab20c29b8315bc96301bfc162 (patch)
tree009bcbc98f85827cc46ebcd0acea0283a553f3a4 /tools/dependencies
parent0845a97b3e8e808aafb060924f543bfc01eed171 (diff)
downloadlibrebootfr-a9d094a7d1faac6ab20c29b8315bc96301bfc162.tar.gz
librebootfr-a9d094a7d1faac6ab20c29b8315bc96301bfc162.zip
Don't work around formatting issues in dependencies tool
Output is fixed with a5babe37f42cc162812f8ed3310a1e0c45eabb67
Diffstat (limited to 'tools/dependencies')
-rwxr-xr-xtools/dependencies/dependencies2
-rwxr-xr-xtools/dependencies/dependencies-helper8
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/dependencies/dependencies b/tools/dependencies/dependencies
index cc9b2b38..53d1ef7d 100755
--- a/tools/dependencies/dependencies
+++ b/tools/dependencies/dependencies
@@ -31,7 +31,7 @@ print() {
local tool_path="$(tool_path "$tool")"
if [[ -z "$arch" ]]; then
- printf '\n%s\n' 'uname(1) produced no output. Exiting' 1>&2
+ printf '%s\n' 'uname(1) produced no output. Exiting' 1>&2
return 1
fi
diff --git a/tools/dependencies/dependencies-helper b/tools/dependencies/dependencies-helper
index 9e02ad3c..238af125 100755
--- a/tools/dependencies/dependencies-helper
+++ b/tools/dependencies/dependencies-helper
@@ -20,11 +20,11 @@ dependencies_print() {
shift
if [[ "$distro" == 'parabola' ]]; then
- printf '\n%s\n' 'Enable the multilib repository in /etc/pacman.conf'
+ printf '%s\n' 'Enable the multilib repository in /etc/pacman.conf'
printf '\n%s\n' 'Then, run the following command as root:'
printf '\n%s%s\n' 'pacman -S --needed ' "$*"
else
- printf '\n%s\n' 'You will need to run the following command as root:'
+ printf '%s\n' 'You will need to run the following command as root:'
printf '\n%s%s\n' 'apt-get -y install ' "$*"
fi
}
@@ -45,7 +45,7 @@ dependencies_arch_supported() {
local distro_dir="$tool_path/$CONFIGS/$distro"
if ! [[ -d "$distro_dir/$arch" ]]; then
- printf '\n%s\n' "Architecture \"$arch\" is not supported" 1>&2
+ printf '%s\n' "Architecture \"$arch\" is not supported" 1>&2
return 1
fi
@@ -64,7 +64,7 @@ dependencies_distro_supported() {
IFS='|' eval 'local distro_list="${targets_list[*]}"'
if [[ "$distro" != @($distro_list) ]]; then
- printf '\n%s' "Argument \"$distro\" is not supported. " 1>&2
+ printf '%s' "Argument \"$distro\" is not supported. " 1>&2
printf '%s\n' 'Check spelling?' 1>&2
usage