rm --wildcard

This commit is contained in:
Vitaliy Filippov
2024-08-31 02:36:25 +03:00
parent 2b96ac0b44
commit 6a8daedbe2
2 changed files with 7 additions and 11 deletions
@@ -59,12 +59,10 @@ if [ -n "$VITASTOR_CONF" ]; then
fi fi
SNAP_FLATTEN_CMD=$(cat <<EOF SNAP_FLATTEN_CMD=$(cat <<EOF
$CLI ls --json ${IMAGE_NAME}@${SNAP_ID} | jq -e 'length > 0' set -e
$CLI rm ${IMAGE_NAME}.flatten || true $CLI flatten "$IMAGE_NAME@$SNAP_ID"
$CLI create --pool "${POOL_NAME}" --parent ${IMAGE_NAME}@${SNAP_ID} ${IMAGE_NAME}.flatten $CLI modify "$IMAGE_NAME@$SNAP_ID" --rename "$IMAGE_NAME"
$CLI flatten ${IMAGE_NAME}.flatten $CLI rm --matching "$IMAGE_NAME@*"
$CLI rm ${IMAGE_NAME} || true
$CLI modify ${IMAGE_NAME}.flatten --rename ${IMAGE_NAME}
EOF EOF
) )
+3 -5
View File
@@ -181,11 +181,9 @@ begin
success_disks.each do |vitastor_disk| success_disks.each do |vitastor_disk|
move = <<~EOS move = <<~EOS
set -e set -e
#{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:img]} #{info[vitastor_disk][:old]}; #{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:img]} #{info[vitastor_disk][:old]}
#{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:bak]} #{info[vitastor_disk][:img]}; #{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:bak]} #{info[vitastor_disk][:img]}
for i in $(#{info[vitastor_disk][:cli]} ls --json "#{info[vitastor_disk][:img]}@*"); do #{info[vitastor_disk][:cli]} rm --matching "#{info[vitastor_disk][:img]}@*"
#{info[vitastor_disk][:cli]} rm "$i"
done
#{info[vitastor_disk][:cli]} rm #{info[vitastor_disk][:old]} #{info[vitastor_disk][:cli]} rm #{info[vitastor_disk][:old]}
EOS EOS