Skip to content

Commit 21e744b

Browse files
committed
Merge branch 'TinCanTech-set_no_clobber-error-detection'
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
2 parents 12980e7 + 7b13d39 commit 21e744b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
22

33
3.2.4 (TBD)
44

5+
* set_no_clobber(): Add simple error detection (0f93880) (#1379)
56
* revoke: Archive request and private key files and expand help (79754da) (#1378)
67
Original bug report: github-user spacefreak86 (#1377)
78
* Remove 'easyrsa_mkdir()', use only 'mkdir' (5738f3d) (#1376)

easyrsa3/easyrsa

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,21 +836,22 @@ set_no_clobber() {
836836
case "$1" in
837837
on)
838838
if [ "$easyrsa_host_os" = win ]; then
839-
set -o noclobber
839+
set -o noclobber && return
840840
else
841-
set -C
841+
set -C && return
842842
fi
843843
;;
844844
off)
845845
if [ "$easyrsa_host_os" = win ]; then
846-
set +o noclobber
846+
set +o noclobber && return
847847
else
848-
set +C
848+
set +C && return
849849
fi
850850
;;
851851
*)
852-
die "set_no_clobber - input"
852+
: # drop to error
853853
esac
854+
die "set_no_clobber() $1, Failed"
854855
} # => set_no_clobber()
855856

856857
# Create lock-file

0 commit comments

Comments
 (0)