Update screen to use bash shell and adapt parse_keyfile output to remove starting $ character and trailing carriage return character : fixes certificate not found error
This commit is contained in:
parent
4bdc75aa81
commit
507eac1b72
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
# When we get killed, kill all our children
|
||||
trap "exit" INT TERM
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
# Source in util.sh so we can have our nice tools
|
||||
. $(cd $(dirname $0); pwd)/util.sh
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
# Helper function to output error messages to STDERR, with red text
|
||||
error() {
|
||||
|
@ -29,8 +29,9 @@ parse_keyfiles() {
|
|||
# keyfiles), return 1 otherwise
|
||||
keyfiles_exist() {
|
||||
for keyfile in $(parse_keyfiles $1); do
|
||||
if [ ! -f $keyfile ]; then
|
||||
echo "Couldn't find keyfile $keyfile for $1"
|
||||
currentfile=${keyfile//$'\r'/}
|
||||
if [ ! -f $currentfile ]; then
|
||||
echo "Couldn't find keyfile $currentfile for $1"
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue