Merge branch 'make-ca-patch' into 'master'

More patches to make-ca.sh for NixOS

See merge request redox-os/cookbook!173
This commit is contained in:
Jeremy Soller 2018-09-23 17:31:26 +00:00
commit 43b32cf798

View File

@ -1,6 +1,5 @@
diff -ru source/make-ca.sh source2/make-ca.sh
--- source/make-ca.sh 2018-05-08 10:27:57.829291956 +0200
+++ source2/make-ca.sh 2018-05-08 10:33:58.040239253 +0200
--- source/make-ca.sh 2018-08-25 17:38:12.512463896 +0200
+++ build/make-ca.sh 2018-09-23 14:45:12.492919202 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
@ -20,3 +19,12 @@ diff -ru source/make-ca.sh source2/make-ca.sh
ANCHORDIR="${PKIDIR}/anchors"
CABUNDLE="${SSLDIR}/ca-bundle.crt"
CERTDIR="${SSLDIR}/certs"
@@ -723,7 +723,7 @@
unset cert
fi
-/usr/bin/c_rehash "${DESTDIR}${CERTDIR}" 2>&1>/dev/null
+c_rehash "${DESTDIR}${CERTDIR}" 2>&1>/dev/null
popd > /dev/null
# Clean up the mess