Skip to content

Commit 10fcbd1

Browse files
TinCanTechTinCanTech
committed
Remove useless file recovery code
The code here is all replaced by code within univeral_update() Signed-off-by: Richard T Bonhomme <[email protected]>
1 parent 16b3ca7 commit 10fcbd1

File tree

1 file changed

+9
-85
lines changed

1 file changed

+9
-85
lines changed

‎easytls

+9-85
Original file line numberDiff line numberDiff line change
@@ -4041,13 +4041,7 @@ inline_tls_auth ()
40414041
if inline_index_update add; then
40424042
: # OK
40434043
else
4044-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4045-
# Restore original inline-index
4046-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4047-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4048-
"${EASYTLS_INLINE_INDEX}"
4049-
die "Failed to update inline-index"
4050-
fi
4044+
die "inline_tls_auth - inline_index_update add"
40514045
fi
40524046

40534047
# share this client FP with server defined by -r=<serv-name> option
@@ -4129,13 +4123,7 @@ inline_tls_crypt_v1 ()
41294123
if inline_index_update add; then
41304124
: # OK
41314125
else
4132-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4133-
# Restore original inline-index
4134-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4135-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4136-
"${EASYTLS_INLINE_INDEX}"
4137-
die "Failed to update inline-index"
4138-
fi
4126+
die "inline_tls_crypt_v1 - inline_index_update add"
41394127
fi
41404128

41414129
# share this client FP with server defined by -r=<serv-name> option
@@ -4329,13 +4317,7 @@ inline_tls_crypt_v2 ()
43294317
if inline_index_update add; then
43304318
: # OK
43314319
else
4332-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4333-
# Restore original inline-index
4334-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4335-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4336-
"${EASYTLS_INLINE_INDEX}"
4337-
die "Failed to update inline-index"
4338-
fi
4320+
die "inline_tls_crypt_v2 - inline_index_update add"
43394321
fi
43404322

43414323
# share this client FP with server defined by -r=<serv-name> option
@@ -4503,13 +4485,7 @@ inline_tls_cv2_group_server ()
45034485
if inline_index_update add; then
45044486
: # OK
45054487
else
4506-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4507-
# Restore original inline-index
4508-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4509-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4510-
"${EASYTLS_INLINE_INDEX}"
4511-
die "Failed to update inline-index"
4512-
fi
4488+
die "inline_tls_crypt_v2_group_server - inline_index_update add"
45134489
fi
45144490

45154491
name="${save_name}"
@@ -4706,13 +4682,7 @@ inline_tls_cv2_group_client ()
47064682
if inline_index_update add; then
47074683
: # OK
47084684
else
4709-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4710-
# Restore original inline-index
4711-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4712-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4713-
"${EASYTLS_INLINE_INDEX}"
4714-
die "Failed to update inline-index"
4715-
fi
4685+
die "inline_tls_crypt_v2_group_client - inline_index_update add"
47164686
fi
47174687

47184688
name="${save_name}"
@@ -4845,24 +4815,7 @@ inline_share_fingerprint ()
48454815
if inline_index_update del; then
48464816
: # OK
48474817
else
4848-
# Restore original inline-index
4849-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4850-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4851-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4852-
"${EASYTLS_INLINE_INDEX}" || \
4853-
die "remove_inline - Restore original inline-index"
4854-
fi
4855-
4856-
# Undo move
4857-
if [ -z "${force_remove}" ]; then
4858-
"${EASYTLS_MV}" "${inline_file}-deleted" "${inline_file}" || \
4859-
die "Failed to restore: ${inline_file}"
4860-
else
4861-
"${EASYTLS_MV}" "${inline_file}-badhash" "${inline_file}" || \
4862-
die "Failed to restore: ${inline_file}"
4863-
fi
4864-
# Always die
4865-
die "Failed to update inline-index"
4818+
die "inline_share_fingerprint - inline_index_update del"
48664819
fi
48674820

48684821
else
@@ -4906,13 +4859,7 @@ inline_share_fingerprint ()
49064859
if inline_index_update add; then
49074860
: # OK
49084861
else
4909-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4910-
# Restore original inline-index
4911-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4912-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4913-
"${EASYTLS_INLINE_INDEX}"
4914-
die "Failed to update inline-index"
4915-
fi
4862+
die "inline_share_fingerprint - inline_index_update add"
49164863
fi
49174864
fi
49184865

@@ -4940,24 +4887,7 @@ inline_share_fingerprint ()
49404887
if inline_index_update del; then
49414888
: # OK
49424889
else
4943-
# Restore original inline-index
4944-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
4945-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
4946-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
4947-
"${EASYTLS_INLINE_INDEX}" || \
4948-
die "remove_inline - Restore original inline-index"
4949-
fi
4950-
4951-
# Undo move
4952-
if [ -z "${force_remove}" ]; then
4953-
"${EASYTLS_MV}" "${inline_file}-deleted" "${inline_file}" || \
4954-
die "Failed to restore: ${inline_file}"
4955-
else
4956-
"${EASYTLS_MV}" "${inline_file}-badhash" "${inline_file}" || \
4957-
die "Failed to restore: ${inline_file}"
4958-
fi
4959-
# Always die
4960-
die "Failed to update inline-index"
4890+
die "inline_share_fingerprint - inline_index_update del"
49614891
fi
49624892

49634893
else
@@ -5013,13 +4943,7 @@ inline_share_fingerprint ()
50134943
if inline_index_update add; then
50144944
: # OK
50154945
else
5016-
if [ -f "${EASYTLS_INLINE_INDEX}-deleted" ]; then
5017-
# Restore original inline-index
5018-
"${EASYTLS_RM}" -f "${EASYTLS_INLINE_INDEX}"
5019-
"${EASYTLS_MV}" "${EASYTLS_INLINE_INDEX}-deleted" \
5020-
"${EASYTLS_INLINE_INDEX}"
5021-
die "Failed to update inline-index"
5022-
fi
4946+
die "inline_share_fingerprint - inline_index_update add"
50234947
fi
50244948
fi
50254949

0 commit comments

Comments
 (0)