[ca-certificates-java] 51/58: postinst: Correct indentation
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 31 13:13:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ca-certificates-java.
commit ddd6f04c0f6e8448439ec79b259828c01a0cb629
Author: Benjamin Drung <bdrung at debian.org>
Date: Mon Nov 7 12:18:39 2016 +0000
postinst: Correct indentation
---
debian/postinst.in | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/debian/postinst.in b/debian/postinst.in
index f5b3a2e..2de981a 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -e
# use the locale C.UTF-8
@@ -43,12 +42,12 @@ setup_path()
first_install()
{
if which dpkg-query >/dev/null; then
- nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p'|head -n 1)
- nsscfg=/etc/${jvm%-$arch}/security/nss.cfg
- nssjdk=$(test ! -f $nsscfg || sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' $nsscfg)
- if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]; then
- ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so
- fi
+ nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p'|head -n 1)
+ nsscfg=/etc/${jvm%-$arch}/security/nss.cfg
+ nssjdk=$(test ! -f $nsscfg || sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' $nsscfg)
+ if [ -n "$nsspkg" ] && [ -n "$nssjdk" ] && [ "$nsspkg" != "$nssjdk" ]; then
+ ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so
+ fi
fi
# Forcibly remove diginotar cert (LP: #920758)
@@ -59,8 +58,8 @@ first_install()
find /etc/ssl/certs -name \*.pem | \
while read filename; do
- alias=$(basename $filename .pem | tr A-Z a-z | tr -cs a-z0-9 _)
- alias=${alias%*_}
+ alias=$(basename $filename .pem | tr A-Z a-z | tr -cs a-z0-9 _)
+ alias=${alias%*_}
if [ -n "$FIXOLD" ]; then
echo "-${alias}"
echo "-${alias}_pem"
@@ -92,8 +91,8 @@ case "$1" in
setup_path
if ! mountpoint -q /proc; then
- echo >&2 "the keytool command requires a mounted proc fs (/proc)."
- exit 1
+ echo >&2 "the keytool command requires a mounted proc fs (/proc)."
+ exit 1
fi
temp_jvm_cfg=
@@ -105,10 +104,10 @@ case "$1" in
fi
if first_install; then
- do_cleanup
+ do_cleanup
else
- do_cleanup
- exit 1
+ do_cleanup
+ exit 1
fi
fi
chmod 600 /etc/default/cacerts || true
@@ -126,5 +125,3 @@ esac
#DEBHELPER#
exit 0
-
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git
More information about the pkg-java-commits
mailing list