[pkg-java] r19172 - trunk/ca-certificates-java/debian
Benjamin Drung
bdrung at moszumanska.debian.org
Mon Nov 7 12:18:40 UTC 2016
Author: bdrung
Date: 2016-11-07 12:18:39 +0000 (Mon, 07 Nov 2016)
New Revision: 19172
Modified:
trunk/ca-certificates-java/debian/postinst.in
Log:
postinst: Correct indentation
Modified: trunk/ca-certificates-java/debian/postinst.in
===================================================================
--- trunk/ca-certificates-java/debian/postinst.in 2016-10-22 16:53:49 UTC (rev 19171)
+++ trunk/ca-certificates-java/debian/postinst.in 2016-11-07 12:18:39 UTC (rev 19172)
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -e
# use the locale C.UTF-8
@@ -43,13 +42,13 @@
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
+ 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
- fi
# Forcibly remove diginotar cert (LP: #920758)
if [ -n "$FIXOLD" ]; then
@@ -59,8 +58,8 @@
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 @@
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 @@
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 @@
#DEBHELPER#
exit 0
-
-
More information about the pkg-java-commits
mailing list