|
|
@@ -17,6 +17,14 @@ TRY_AND_RETRY () {
|
|
|
done
|
|
|
}
|
|
|
|
|
|
+sudo_prog='sudo --prompt=Sudo_Password:'
|
|
|
+
|
|
|
+_MOUNT () {
|
|
|
+ echo "Mounting ${1} into ${2}"
|
|
|
+ TRY_AND_RETRY "${sudo_prog} mount $[1} ${2}" "Failed to mound ${1} on ${2}."
|
|
|
+ echo "Succesfully Mounted ${1} into ${2}"
|
|
|
+}
|
|
|
+
|
|
|
file_path="$1"
|
|
|
test -n "$file_path" || { echo 'No file given'; exit 1; }
|
|
|
file="$(basename "$file_path")"
|
|
|
@@ -27,7 +35,6 @@ block_dev="/dev/mapper/${_name}"
|
|
|
cur_uid="$(id -u)"
|
|
|
cur_gid="$(id -g)"
|
|
|
|
|
|
-sudo_prog='sudo --prompt=Sudo_Password:'
|
|
|
|
|
|
test "$ext" = 'luks' || ERR "File $file_path does not have extencion .luks." 1
|
|
|
|
|
|
@@ -95,9 +102,7 @@ else
|
|
|
TRY_AND_RETRY "${sudo_prog} mkfs.ext4 -m0 ${block_dev}" "Failed to format block dev: ${block_dev}"
|
|
|
echo "Succesfully Formated ${_name} as ext4"
|
|
|
|
|
|
- echo "Mounting ${block_dev} into ./${name}"
|
|
|
- TRY_AND_RETRY "${sudo_prog} mount ${block_dev} ./${name}" "Failed to mound ${block_dev} on ./${name}."
|
|
|
- echo "Succesfully Mounted ${block_dev} into ./${name}"
|
|
|
+ _MOUNT "$block_dev" "./${name}"
|
|
|
|
|
|
dir_perm="$(stat -c '%u:%g' "$file_path")"
|
|
|
cur_perm="${cur_uid}:${cur_gid}"
|
|
|
@@ -122,8 +127,7 @@ fi
|
|
|
echo "Opening luks file: ${file_path} as ${_name}."
|
|
|
$sudo_prog cryptsetup luksOpen "$file_path" "$_name" || ERR "Failed to open luks file: ${file_path}." 1
|
|
|
|
|
|
-echo "Mounting ${block_dev} into ./${name}"
|
|
|
-$sudo_prog mount "$block_dev" ./"$name" || ERR "Failed to mound ${block_dev} on ./${name}." 1
|
|
|
+_MOUNT "$block_dev" "./${name}"
|
|
|
|
|
|
dir_perm="$(stat -c '%u:%g' "$file_path")"
|
|
|
cur_perm="${cur_uid}:${cur_gid}"
|