From 692496dcd37d9c06b8f6aa0d6cf57670f41ffd5e Mon Sep 17 00:00:00 2001
From: Russ Long <rlong@nabancard.com>
Date: Fri, 13 Sep 2019 11:45:52 -0400
Subject: [PATCH] Correct links and change urls to self-hosted files

---
 usbcreator.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/usbcreator.sh b/usbcreator.sh
index a333d33..9f6e82a 100644
--- a/usbcreator.sh
+++ b/usbcreator.sh
@@ -72,7 +72,8 @@ then
 
   #Fetch Easy2Boot
   echo "Fetching Easy2Boot..."
-  wget -O $DIR/E2B.zip "http://files.easy2boot.com/200003511-5bf395cedc/Easy2Boot_v1.A9.zip" > /dev/null 2>&1
+#  wget -O $DIR/E2B.zip "http://files.easy2boot.com/200003511-5bf395cedc/Easy2Boot_v1.A9.zip" > /dev/null 2>&1
+  wget -O $DIR/E2B.zip "https://download.fosshub.com/Protected/expiretime=1568437254;badurl=aHR0cHM6Ly93d3cuZm9zc2h1Yi5jb20vRWFzeTJCb290Lmh0bWw=/8749fa379dda0f73336f706c06823a88a13413c8129fd5bd0b21b8c0a4019617/5d01346325224d0a6d31f6d8/5d610cc64a9c362e9124c8d2/Easy2Boot_v1.B5.zip" > /dev/null 2>&1
 
   #Extract it
   echo "Extracting Easy2Boot..."
@@ -112,14 +113,16 @@ then
   wget -O $DIR/chntpw.zip http://pogostick.net/~pnh/ntpasswd/cd140201.zip > /dev/null 2>&1
   unzip chntpw.zip 
   cp cd140201.iso /mnt/myusb/_ISO/MAINMENU/chntpw.iso
-  wget -O $DIR/clonezilla.iso https://downloads.sourceforge.net/project/clonezilla/clonezilla_live_stable/2.6.0-37/clonezilla-live-2.6.0-37-amd64.iso > /dev/null 2>&1
+  wget -O $DIR/clonezilla.iso "https://osdn.net/frs/redir.php?m=constant&f=clonezilla%2F71318%2Fclonezilla-live-2.6.2-15-amd64.iso" > /dev/null 2>&1
   cp clonezilla.iso /mnt/myusb/_ISO/MAINMENU/
-  wget -O $DIR/supergrub2disk.iso https://downloads.sourceforge.net/project/supergrub2/2.02s10/super_grub2_disk_2.02s10/super_grub2_disk_hybrid_2.02s10.iso > /dev/null 2>&1
+  wget -O $DIR/supergrub2disk.iso "https://sourceforge.net/settings/mirror_choices?projectname=supergrub2&filename=2.04s1/super_grub2_disk_2.04s1/super_grub2_disk_hybrid_2.04s1.iso&selected=managedway" > /dev/null 2>&1
   cp supergrub2disk.iso /mnt/myusb/_ISO/MAINMENU/
-  wget -O $DIR/systemrescuecd.iso https://osdn.net/projects/systemrescuecd/storage/releases/6.0.2/systemrescuecd-6.0.2.iso > /dev/null 2>&1
+  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 systemcrescuecd.iso /mnt/myusb/_ISO/MAINMENU/
   popd > /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
+#  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
   mv acti-new.iso acronis-new.iso 
   mv acti-2012.iso acronis-2012.iso 
   mv WPEF.iso WinPE_Fixer.iso
@@ -170,4 +173,4 @@ else
   echo "You said no, stopping."
   exit 1
 
-fi
\ No newline at end of file
+fi