Skip to content

Commit

Permalink
Merge branch 'TinCanTech-correct-easyrsa-mkdir-p'
Browse files Browse the repository at this point in the history
Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Apr 4, 2024
2 parents becdcb7 + 543418d commit a1890fa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion distro/windows/bin/easyrsa-shell-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Please try using one of the following solutions:
These will start EasyRSA in your user's 'home directory/easy-rsa'
Press enter to exit."
Press enter to exit.
ACCESS_DENIED_MSG

#shellcheck disable=SC2162
Expand Down
6 changes: 4 additions & 2 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -807,13 +807,15 @@ easyrsa_mkdir_p() {
if [ -d "$1" ]; then
: # ok
else
mkdir "$1" || die "(1) easyrsa_mkdir_p: $1"
mkdir "$1"
[ -d "$1" ] || die "(1) easyrsa_mkdir_p: $1"
fi

if [ -d "$1/$2" ]; then
return 0 # Exists ok
else
mkdir "$1/$2" && return 0 # Exists now
mkdir "$1/$2"
[ -d "$1/$2" ] && return 0 # Exists now
fi
die "(2) easyrsa_mkdir_p: $1/$2"
} # => easyrsa_mkdir_p()
Expand Down

0 comments on commit a1890fa

Please sign in to comment.