From 54b42efaa28c8f4cbb6b26c5c7a14c0b47947e91 Mon Sep 17 00:00:00 2001
From: Russ Long <rlong@nabancard.com>
Date: Mon, 2 Dec 2019 15:57:43 -0500
Subject: [PATCH] update fetch commands and add Kali

---
 usbcreator.sh | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/usbcreator.sh b/usbcreator.sh
index 3ffb061..dbf90fa 100644
--- a/usbcreator.sh
+++ b/usbcreator.sh
@@ -117,17 +117,25 @@ then
   cp supergrub2disk.iso /mnt/myusb/_ISO/MAINMENU/
   wget -O $DIR/systemrescuecd.iso "https://osdn.net/projects/systemrescuecd/storage/releases/6.0.3/systemrescuecd-6.0.3.iso" > /dev/null 2>&1
   cp systemrescuecd.iso /mnt/myusb/_ISO/MAINMENU/
+  wget -O $DIR/kali-2019.04.iso "https://cdimage.kali.org/kali-2019.4/kali-linux-2019.4-amd64.iso" > /dev/null 2>&1
+  cp kali-2019.04.iso /mnt/myusb/_ISO/MAINMENU/
+  wget -O $DIR/acti-new.iso "https://f002.backblazeb2.com/file/tfmm-files/acti-new.iso" > /dev/null 2>&1
+  cp acti-new.iso /mnt/myusb/_ISO/MAINMENU/acronis-new.iso 
+  wget -O $DIR/acti-2012.iso "https://f002.backblazeb2.com/file/tfmm-files/acti-2012.iso" > /dev/null 2>&1
+  cp acti-2012.iso /mnt/myusb/_ISO/MAINMENU/acronis-2012.iso 
+  wget -O $DIR/WPEF.iso "https://f002.backblazeb2.com/file/tfmm-files/WPEF.iso" > /dev/null 2>&1
+  cp WPEF.iso /mnt/myusb/_ISO/MAINMENU/WinPE_Fixer.iso
   popd > /dev/null 2>&1
-  pushd /mnt/myusb/_ISO/MAINMENU/ > /dev/null 2>&1
+#  pushd /mnt/myusb/_ISO/MAINMENU/ > /dev/null 2>&1
 #  wget -nd -e robots=off -r --no-parent /mnt/myusb/_ISO/MAINMENU/ http://files.tfmm.co/isos/ --reject index.htm* > /dev/null 2>&1
 #  for iso in $(curl -s -X GET 'https://registry.tfmm.co/service/rest/v1/assets?repository=tfmm-raw'| jq -r '.items | .[].downloadUrl'); do wget $iso; done
-  wget -O acti-new.iso "https://f002.backblazeb2.com/file/tfmm-files/acti-new.iso" > /dev/null 2>&1
-  mv acti-new.iso /mnt/myusb/_ISO/MAINMENU/acronis-new.iso 
-  wget -O acti-2012.iso "https://f002.backblazeb2.com/file/tfmm-files/acti-2012.iso" > /dev/null 2>&1
-  mv acti-2012.iso /mnt/myusb/_ISO/MAINMENU/acronis-2012.iso 
-  wget -O WPEF.iso "https://f002.backblazeb2.com/file/tfmm-files/WPEF.iso" > /dev/null 2>&1
-  mv WPEF.iso /mnt/myusb/_ISO/MAINMENU/WinPE_Fixer.iso
-  popd > /dev/null 2>&1
+#  wget -O acti-new.iso "https://f002.backblazeb2.com/file/tfmm-files/acti-new.iso" > /dev/null 2>&1
+#  mv acti-new.iso /mnt/myusb/_ISO/MAINMENU/acronis-new.iso 
+#  wget -O acti-2012.iso "https://f002.backblazeb2.com/file/tfmm-files/acti-2012.iso" > /dev/null 2>&1
+#  mv acti-2012.iso /mnt/myusb/_ISO/MAINMENU/acronis-2012.iso 
+#  wget -O WPEF.iso "https://f002.backblazeb2.com/file/tfmm-files/WPEF.iso" > /dev/null 2>&1
+#  mv WPEF.iso /mnt/myusb/_ISO/MAINMENU/WinPE_Fixer.iso
+#  popd > /dev/null 2>&1
 
   #Use E2B's defragger
   echo "Defragmenting the drive and ISOs..."