aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwift Geek <swiftgeek@gmail.com>2019-02-22 18:10:51 +0000
committerGogs <gogitservice@gmail.com>2019-02-22 18:10:51 +0000
commit912f542cc666f803e4191db9468a21d6d25e2673 (patch)
tree6077fa799d57157994116ed67d9bd877de21e18a
parent2db4a80b2280bcf1894d2062b97e8df8f47c5178 (diff)
parenta9d094a7d1faac6ab20c29b8315bc96301bfc162 (diff)
downloadlibrebootfr-912f542cc666f803e4191db9468a21d6d25e2673.tar.gz
librebootfr-912f542cc666f803e4191db9468a21d6d25e2673.zip
Merge branch 'formatting' of and_who/libreboot into master
-rwxr-xr-xlibs/project2
-rwxr-xr-xlibs/tool2
-rwxr-xr-xtools/dependencies/dependencies2
-rwxr-xr-xtools/dependencies/dependencies-helper8
4 files changed, 7 insertions, 7 deletions
diff --git a/libs/project b/libs/project
index fc7ee232..f90b368e 100755
--- a/libs/project
+++ b/libs/project
@@ -152,7 +152,7 @@ project_action() {
project_action_check "$action" "$project" "$@"
- printf '%s\n' "Project $project $action (with ${arguments:-no argument})"
+ printf '%s\n\n' "Project $project $action (with ${arguments:-no argument})"
if "$action" "$@"; then
printf '\n%s\n' "Project $project $action (with ${arguments:-no argument}) completed"
diff --git a/libs/tool b/libs/tool
index be28129c..f4e8a783 100755
--- a/libs/tool
+++ b/libs/tool
@@ -97,7 +97,7 @@ tool_action() {
return 0
fi
- printf '%s\n' "Tool $tool $action (with ${arguments:-no argument})"
+ printf '%s\n\n' "Tool $tool $action (with ${arguments:-no argument})"
(
set -e
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