@@ -3158,12 +3158,6 @@ remove_inline ()
3158
3158
die " Failed to update inline-index"
3159
3159
fi
3160
3160
3161
- # Inline file and record deleted - Forget the HASH
3162
- # Otherwise 'inline_renew add' still has the HASH
3163
- # Logically, this *cannot* be removed -- tct
3164
- # Improve this! please..
3165
- unset -v inline_hash
3166
-
3167
3161
if [ -z " ${force_remove} " ]; then
3168
3162
notice " Inline file removed: ${inline_file} "
3169
3163
else
@@ -3221,7 +3215,7 @@ remove_group_inline ()
3221
3215
3222
3216
# Move
3223
3217
if [ -z " ${force_remove} " ]; then
3224
- " ${EASYTLS_MV} " " ${inline_file} " " ${inline_file} -deleted " || \
3218
+ " ${EASYTLS_MV} " " ${inline_file} " " ${EASYTLS_TEMP_DELETED} " || \
3225
3219
die " Failed to move: ${inline_file} "
3226
3220
else
3227
3221
" ${EASYTLS_MV} " " ${inline_file} " " ${inline_file} -badhash" || \
@@ -3232,21 +3226,13 @@ remove_group_inline ()
3232
3226
if inline_index_update del; then
3233
3227
# Remove
3234
3228
if [ -z " ${force_remove} " ]; then
3235
- " ${EASYTLS_RM} " " ${inline_file} -deleted " || \
3229
+ " ${EASYTLS_RM} " " ${EASYTLS_TEMP_DELETED} " || \
3236
3230
die " Failed to remove: ${inline_file} "
3237
3231
fi
3238
3232
else
3239
- # Restore original inline-index
3240
- if [ -f " ${EASYTLS_INLINE_INDEX} -deleted" ]; then
3241
- " ${EASYTLS_RM} " -f " ${EASYTLS_INLINE_INDEX} "
3242
- " ${EASYTLS_MV} " " ${EASYTLS_INLINE_INDEX} -deleted" \
3243
- " ${EASYTLS_INLINE_INDEX} " || \
3244
- die " remove_inline - Restore original inline-index"
3245
- fi
3246
-
3247
3233
# Undo move
3248
3234
if [ -z " ${force_remove} " ]; then
3249
- " ${EASYTLS_MV} " " ${inline_file} -deleted " " ${inline_file} " || \
3235
+ " ${EASYTLS_MV} " " ${EASYTLS_TEMP_DELETED} " " ${inline_file} " || \
3250
3236
die " Failed to restore: ${inline_file} "
3251
3237
else
3252
3238
" ${EASYTLS_MV} " " ${inline_file} -badhash" " ${inline_file} " || \
@@ -3256,12 +3242,6 @@ remove_group_inline ()
3256
3242
die " Failed to update inline-index"
3257
3243
fi
3258
3244
3259
- # Inline file and record deleted - Forget the HASH
3260
- # Otherwise 'inline_renew add' still has the HASH
3261
- # Logically, this *cannot* be removed -- tct
3262
- # Improve this! please..
3263
- unset -v inline_hash
3264
-
3265
3245
if [ -z " ${force_remove} " ]; then
3266
3246
notice " Inline file removed: ${inline_file} "
3267
3247
else
0 commit comments