pull some things in to a library

1 files changed, 7 insertions, 4 deletions

diff --git a/osi-extract b/osi-extract
index b978a51..0030f80 100755
--- a/osi-extract
+++ b/osi-extract
@@ -2,12 +2,15 @@
 # 2018 Luke Shumaker
 {
 	set -euE
-	image=$1
-	src=$(realpath -ms -- "$2")
-	dst=$3
+	source "${BASH_SOURCE[0]%/*}/lib/osi.sh"
+
+	arg_image=$1
+	arg_src=$(realpath -ms -- "$2")
+	arg_dst=$3
+	needs_sudo
 
 	mountpoint=$(mktemp -dt -- "${0##*/}.XXXXXXXXXX")
 	trap "rmdir -- ${mountpoint@Q}" EXIT
 
-	sudo unshare --mount sh -c "mount --make-rslave / && mount ${image@Q} ${mountpoint@Q} && cp -aT -- ${mountpoint@Q}/${src@Q} ${dst@Q}"
+	with_mount "$arg_image" "$mountpoint" sudo -u "#${SUDI_UID}" -- cp -aT -- "$mountpoint/$src" "$dst"
 }