From 53e6b06cdef96a623de82f36ee6541821ca31f86 Mon Sep 17 00:00:00 2001
From: cvoges12 <vogesclayton@gmail.com>
Date: Tue, 28 Sep 2021 17:38:12 +0000
Subject: [PATCH] Refactored; Removed sudo from rm win/

---
 src/extract_iso.sh | 13 +++++++++++++
 src/init.sh        | 13 +------------
 src/iso.sh         | 18 +++++++++---------
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100755 src/extract_iso.sh

diff --git a/src/extract_iso.sh b/src/extract_iso.sh
new file mode 100755
index 0000000..4a68688
--- /dev/null
+++ b/src/extract_iso.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# mount iso
+sudo mkdir -p /mnt/iso
+sudo mount -o loop Win10* /mnt/iso
+
+# copy iso files
+mkdir -p win
+cp -r /mnt/iso/* win/
+
+# clean up mount
+sudo umount /mnt/iso
+sudo rm -rf /mnt/iso
diff --git a/src/init.sh b/src/init.sh
index 09cd20b..632464d 100755
--- a/src/init.sh
+++ b/src/init.sh
@@ -1,15 +1,4 @@
 #!/bin/sh
 
-sudo src/iso.sh
-
-# add answerfile
-cp data/autounattend.xml win/
-
-# install mkisofs
-# recreate iso
-mkisofs --allow-limited-size -o win.iso win
-
-# clean up iso extract
-sudo rm -rf win
-
+src/iso.sh
 src/vm.sh
diff --git a/src/iso.sh b/src/iso.sh
index 5e907dc..a372101 100755
--- a/src/iso.sh
+++ b/src/iso.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-# extract iso
-mkdir -p /mnt/iso
-mount -o loop Win10* /mnt/iso
+src/extract_iso.sh
 
-# copy iso files
-mkdir -p win
-cp -r /mnt/iso/* win/
+# add answerfile
+cp data/autounattend.xml win/
 
-# clean up mount
-umount /mnt/iso
-rm -rf /mnt/iso
+# install mkisofs
+# recreate iso
+mkisofs --allow-limited-size -o win.iso win
+
+# clean up iso extract
+rm -rf win