emo/make-ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow rebuild with DESTDIR

Browse Source
This commit is contained in:
DJ Lucas 2017-09-22 16:37:00 -05:00
parent 0adb08d7e8
commit e44fa32914
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -3,6 +3,7 @@
- Add -g/--get option to download using only s_client - Add -g/--get option to download using only s_client
- Always add REVISION value to installed certdata.txt - Always add REVISION value to installed certdata.txt
- Use HG revision value (fall back to date for local files) - Use HG revision value (fall back to date for local files)
- Allow rebuid within DESTDIR
0.1 - Check executable bit for CERTUTIL, KEYTOOL, and OPENSSL 0.1 - Check executable bit for CERTUTIL, KEYTOOL, and OPENSSL
- Allow global configuration file - Allow global configuration file
- Use correct license text (MIT) - Use correct license text (MIT)

9
make-ca
View File

@ -192,11 +192,6 @@ function get_args(){
echo "Error: ${1} cannot be used with the -C/--certdata or -g/--get switches." echo "Error: ${1} cannot be used with the -C/--certdata or -g/--get switches."
exit 3 exit 3
fi fi
CERTDATA="${SSLDIR}/certdata.txt"
if test ! -f "${CERTDATA}"; then
echo "Error: ${CERTDATA} not found!"
exit 3
fi
;; ;;
-s | --openssl) -s | --openssl)
check_arg $1 $2 check_arg $1 $2
@ -417,6 +412,10 @@ if test "${GET}" == "1"; then
sed "1i # Revision:${REVISION}" -i "${CERTDATA}" sed "1i # Revision:${REVISION}" -i "${CERTDATA}"
fi fi
if test "${REBUILD}" == "1"; then
CERTDATA="${DESTDIR}${SSLDIR}/certdata.txt"
fi
if test ! -r "${CERTDATA}"; then if test ! -r "${CERTDATA}"; then
echo "${CERTDATA} was not found. The certdata.txt file must be in the local" echo "${CERTDATA} was not found. The certdata.txt file must be in the local"
echo "directory, speficied with the -C/--certdata switch, or downloaded with" echo "directory, speficied with the -C/--certdata switch, or downloaded with"