Sfoglia il codice sorgente

Using TRY_AND_RETRY on closing route

Vinicius Teshima 10 mesi fa
parent
commit
5ec810b7ba
1 ha cambiato i file con 4 aggiunte e 6 eliminazioni
  1. 4 6
      luks.sh

+ 4 - 6
luks.sh

@@ -54,7 +54,6 @@ block_dev="/dev/mapper/${_name}"
 cur_uid="$(id -u)"
 cur_gid="$(id -g)"
 
-
 test "$ext" = 'luks' || ERR "File $file_path does not have extencion .luks." 1
 
 if test -e ./"$name"
@@ -69,11 +68,11 @@ then
 			N|n) exit 0 ;;
 		esac
 		echo "Unmounting ./${name}"
-		$sudo_prog umount ./"$name" || ERR "Failed to unmount ./${name}." 1
+		TRY_AND_RETRY "${sudo_prog} umount ./${name}" "Failed to unmount ./${name}."
+		echo "Succesfully Unmounted ./${name}"
 
 		echo "Closing luks block dev ${block_dev}"
-		$sudo_prog cryptsetup close "$block_dev" || ERR "Failed to close luks file: ${file_path}." 1
-
+		TRY_AND_RETRY "${sudo_prog} cryptsetup close ${block_dev}" "Failed to close luks file: ${file_path}."
 		echo "Succesfully Closed ${file_path}."
 
 		echo -n "Delete directory ./${name}? (Y/n) "
@@ -82,10 +81,9 @@ then
 			N|n) exit 0 ;;
 		esac
 
-		rmdir ./$name || ERR "Failed to remove directory: ./${name}" 1
+		TRY_AND_RETRY rmdir "./${name}" "Failed to remove directory: ./${name}"
 		exit 0
 	fi
-
 else
 	mkdir ./"$name"
 fi