Disk : Reimplement the unlock function.

home/program/bash/module/Disk.nix

@@ -13,19 +13,40 @@
 		}
 
 		# Unlock encrypted disk file.
-		# Usage: unlock <FILE>
+		# Usage: unlock <FILE> <DIR>
 		function unlock() {
-			_filter() {
+			if [[ "''${UID}" != 0 ]]; then
-				sed -e "s/.*\ a[st]\ //" -e "s/\.$//"
+				_error "Must be root."
-			}
+				return 2
-			local file="''${1}"
+			fi
-			local name=$(parse_alnum ''${file} | _filter)
-			local loop=$(udisksctl loop-setup -f "''${file}" | _filter)
-			local unlock=$(udisksctl unlock -b "''${loop}" | _filter)
-			local mount=$(udisksctl mount -b "''${unlock}" | _filter)
 
-			[ -L "./''${name}" ] || ln -s "''${mount}" "./''${name}"
+			local file="''${1}"
-			cd "''${mount}"
+			local dir="''${2}"
+
+			if [[ "''${dir}" = "" ]]; then
+				help unlock
+				return 2
+			fi
+
+			local name=$(parse_alnum "''${file##*/}")
+			cryptsetup open "''${file}" "''${name}"
+			mount "/dev/mapper/''${name}" "''${dir}"
 		}
+
+		# Unlock encrypted disk file.
+		# Usage: unlock <FILE>
+		# function unlock() {
+		# 	_filter() {
+		# 		sed -e "s/.*\ a[st]\ //" -e "s/\.$//"
+		# 	}
+		# 	local file="''${1}"
+		# 	local name=$(parse_alnum ''${file} | _filter)
+		# 	local loop=$(udisksctl loop-setup -f "''${file}" | _filter)
+		# 	local unlock=$(udisksctl unlock -b "''${loop}" | _filter)
+		# 	local mount=$(udisksctl mount -b "''${unlock}" | _filter)
+
+		# 	[ -L "./''${name}" ] || ln -s "''${mount}" "./''${name}"
+		# 	cd "''${mount}"
+		# }
 	'';
 }