Skip to content

Commit b68ec3b

Browse files
authored
Improve code layout in usage examples (#41)
* Split lines which are more than 80 chars long. * Make indentation style consistent (always tabs).
1 parent d6a2a6c commit b68ec3b

File tree

6 files changed

+44
-17
lines changed

6 files changed

+44
-17
lines changed

examples/components_individually.sh

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,37 @@ BUILD_DIR="${TRAVIS_BUILD_DIR}/b"
2222
# libgpg-error, and enable it (default) for other components.
2323
# In order to satisfy dependencies, components should be installed
2424
# in a specific order.
25-
./install_gpg_component.sh --component-name libgpg-error --component-version latest --sudo \
26-
--configure-opts "--disable-doc"
27-
./install_gpg_component.sh --component-name libgcrypt --component-version latest --sudo \
28-
--build-dir "${BUILD_DIR}"
29-
./install_gpg_component.sh --component-name libassuan --component-version latest --sudo
30-
./install_gpg_component.sh --component-name libksba --component-version latest --sudo
31-
./install_gpg_component.sh --component-name npth --component-version latest --sudo
32-
./install_gpg_component.sh --component-name pinentry --component-version 1.1.0 --sudo
33-
./install_gpg_component.sh --component-name gnupg --component-version 2.2.10 --sudo \
34-
--configure-opts "--enable-gpg-sha256 --disable-gpg-sha512 --enable-doc"
25+
./install_gpg_component.sh \
26+
--component-name libgpg-error \
27+
--component-version latest \
28+
--configure-opts "--disable-doc" \
29+
--sudo
30+
./install_gpg_component.sh \
31+
--component-name libgcrypt \
32+
--component-version latest \
33+
--build-dir "${BUILD_DIR}" \
34+
--sudo
35+
./install_gpg_component.sh \
36+
--component-name libassuan \
37+
--component-version latest \
38+
--sudo
39+
./install_gpg_component.sh \
40+
--component-name libksba \
41+
--component-version latest \
42+
--sudo
43+
./install_gpg_component.sh \
44+
--component-name npth \
45+
--component-version latest \
46+
--sudo
47+
./install_gpg_component.sh \
48+
--component-name pinentry \
49+
--component-version 1.1.0 \
50+
--sudo
51+
./install_gpg_component.sh \
52+
--component-name gnupg \
53+
--component-version 2.2.10 \
54+
--configure-opts "--enable-gpg-sha256 --disable-gpg-sha512 --enable-doc" \
55+
--sudo
3556

3657
###############
3758
# TESTS #

examples/configure_options.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ set -v # Print executed lines
1414
# --enable-gpg-sha256 and --disable-gpg-sha512 are relevant to GnuPG component,
1515
# whereas --disable-doc is relevant for all components. This is okay, however
1616
# warnings will be printed.
17-
./install_gpg_all.sh --suite-version latest --sudo --configure-opts "--disable-doc \
18-
--enable-pinentry-curses --enable-gpg-sha256 --disable-gpg-sha512"
17+
./install_gpg_all.sh --suite-version latest --sudo \
18+
--configure-opts "--disable-doc --enable-pinentry-curses \
19+
--enable-gpg-sha256 --disable-gpg-sha512"
1920

2021
###############
2122
# TESTS #

examples/folding_travis.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ set -v # Print executed lines
1414
# Note that `sudo ./install_gpg_all …` is not the same—it would compile as
1515
# root (not recommended), and won't trigger post-install steps (including
1616
# ldconfig).
17-
./install_gpg_all.sh --suite-version latest --sudo --folding-style travis | tee ./output
17+
./install_gpg_all.sh --suite-version latest --sudo --folding-style travis | \
18+
tee ./output
1819

1920
###############
2021
# TESTS #

examples/gpgme.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ set -v # Print executed lines
1313
# Note that `sudo ./install_gpg_all …` is not the same—it would compile as
1414
# root (not recommended), and won't trigger post-install steps (including
1515
# ldconfig).
16-
./install_gpg_all.sh --suite-version latest --sudo
17-
./install_gpg_component.sh --component-name gpgme --component-version latest --sudo
16+
./install_gpg_all.sh \
17+
--suite-version latest --sudo
18+
./install_gpg_component.sh \
19+
--component-name gpgme --component-version latest --sudo
1820

1921
###############
2022
# TESTS #

examples/install_prefix.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ export PATH="${EXEC_PREFIX}/bin:${PATH}"
3333

3434
mkdir -p ${GPG_PREFIX} ${EXEC_PREFIX} ${MAN_DIR}
3535

36-
./install_gpg_all.sh --suite-version latest --sudo --configure-opts "${GPG_CONFIGURE_OPTS}"
36+
./install_gpg_all.sh --suite-version latest --sudo \
37+
--configure-opts "${GPG_CONFIGURE_OPTS}"
3738

3839
###############
3940
# TESTS #

examples/no_sudo.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export PATH="${GPG_PREFIX}/bin:${PATH}"
2929

3030
mkdir -p ${GPG_PREFIX}
3131

32-
./install_gpg_all.sh --suite-version latest --no-sudo --configure-opts "${GPG_CONFIGURE_OPTS}"
32+
./install_gpg_all.sh --suite-version latest --no-sudo \
33+
--configure-opts "${GPG_CONFIGURE_OPTS}"
3334

3435
###############
3536
# TESTS #

0 commit comments

Comments
 (0)