kiss-community/repo
2
0
Fork 1
mirror of https://codeberg.org/kiss-community/repo synced 2025-01-28 10:27:41 -07:00
Code Issues Wiki

ca-certificates: fix shellcheck

Browse Source
This commit is contained in:
Dylan Araps 2019-08-25 01:49:05 +00:00
parent 6cf5358df9
commit 5c00edc683
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ca-certificates/checksums
View File

@ -1,3 +1,3 @@
c979c6f35714a0fedb17d9e5ba37adecbbc91a8faf4186b4e23d6f9ca44fd6cb certdata.txt c979c6f35714a0fedb17d9e5ba37adecbbc91a8faf4186b4e23d6f9ca44fd6cb certdata.txt
064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7 certdata2pem.c 064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7 certdata2pem.c
a4283508b5775a67c7df65b28bbe9100817ffda97db3a789a5414742ac66335c update-ca-certificates 0427333826d678c885495ef11f3bb70cd340a5238f2ce34a7879c581887603b7 update-ca-certificates

19
core/ca-certificates/files/update-ca-certificates
View File

@ -98,6 +98,7 @@ add() {
echo "+$PEM" >> "$ADDED" echo "+$PEM" >> "$ADDED"
fi fi
# Add trailing newline to certificate, if it is missing (#635570) # Add trailing newline to certificate, if it is missing (#635570)
# shellcheck disable=1003
sed -e '$a\' "$CERT" >> "$TEMPBUNDLE" sed -e '$a\' "$CERT" >> "$TEMPBUNDLE"
} }
@ -114,13 +115,13 @@ remove() {
cd "$ETCCERTSDIR" cd "$ETCCERTSDIR"
if [ "$fresh" = 1 ]; then if [ "$fresh" = 1 ]; then
echo "Clearing symlinks in $ETCCERTSDIR..." echo "Clearing symlinks in $ETCCERTSDIR..."
find . -type l -print | while read symlink find . -type l -print | while read -r symlink
do do
case $(readlink "$symlink") in case $(readlink "$symlink") in
$CERTSDIR*|$LOCALCERTSDIR*) rm -f $symlink;; "$CERTSDIR"*|"$LOCALCERTSDIR"*) rm -f "$symlink" ;;
esac esac
done done
find . -type l -print | while read symlink find . -type l -print | while read -r symlink
do do
test -f "$symlink" || rm -f "$symlink" test -f "$symlink" || rm -f "$symlink"
done done
@ -131,7 +132,7 @@ echo "Updating certificates in $ETCCERTSDIR..."
# Add default certificate authorities if requested # Add default certificate authorities if requested
if [ "$default" = 1 ]; then if [ "$default" = 1 ]; then
find -L "$CERTSDIR" -type f -name '*.crt' | sort | while read crt find -L "$CERTSDIR" -type f -name '*.crt' | sort | while read -r crt
do do
add "$crt" add "$crt"
done done
@ -139,12 +140,12 @@ fi
# Handle certificates that should be removed. This is an explicit act # Handle certificates that should be removed. This is an explicit act
# by prefixing lines in the configuration files with exclamation marks (!). # by prefixing lines in the configuration files with exclamation marks (!).
sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read -r crt
do do
remove "$CERTSDIR/$crt" remove "$CERTSDIR/$crt"
done done
sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read -r crt
do do
if ! test -f "$CERTSDIR/$crt" if ! test -f "$CERTSDIR/$crt"
then then
@ -158,7 +159,7 @@ done
# administrator. # administrator.
if [ -d "$LOCALCERTSDIR" ] if [ -d "$LOCALCERTSDIR" ]
then then
find -L "$LOCALCERTSDIR" -type f -name '*.crt' | sort | while read crt find -L "$LOCALCERTSDIR" -type f -name '*.crt' | sort | while read -r crt
do do
add "$crt" add "$crt"
done done
@ -174,7 +175,7 @@ then
# only run if set of files has changed # only run if set of files has changed
# Remove orphan symlinks found in ETCCERTSDIR to prevent `openssl certhash` # Remove orphan symlinks found in ETCCERTSDIR to prevent `openssl certhash`
# from exiting with an error. See #895482, #895473. # from exiting with an error. See #895482, #895473.
find $ETCCERTSDIR -type l ! -exec test -e {} \; -print | while read orphan find "$ETCCERTSDIR" -type l ! -exec test -e {} \; -print | while read -r orphan
do do
rm -f "$orphan" rm -f "$orphan"
if [ "$verbose" = 1 ]; then if [ "$verbose" = 1 ]; then
@ -202,7 +203,7 @@ then
echo "Running hooks in $HOOKSDIR..." echo "Running hooks in $HOOKSDIR..."
VERBOSE_ARG= VERBOSE_ARG=
[ "$verbose" = 0 ] || VERBOSE_ARG="--verbose" [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose"
eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read -r hook
do do
( cat "$ADDED" ( cat "$ADDED"
cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?." cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?."