From ac1ee5f695e70423bb526c90653c526ac5e14bb0 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Thu, 8 Mar 2018 19:09:22 -0700
Subject: [PATCH] More HWiNFO updates

---
 .bin/Scripts/build_pe.ps1        | 2 +-
 .bin/Scripts/functions/update.py | 8 +-------
 .bin/Scripts/settings/sources.py | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.bin/Scripts/build_pe.ps1 b/.bin/Scripts/build_pe.ps1
index 1da81275..80fce4f0 100644
--- a/.bin/Scripts/build_pe.ps1
+++ b/.bin/Scripts/build_pe.ps1
@@ -141,7 +141,7 @@ if ($MyInvocation.InvocationName -ne ".") {
             @("fastcopy64.zip", "http://ftp.vector.co.jp/69/93/2323/FastCopy341_x64.zip"),
             @("fastcopy32.zip", "http://ftp.vector.co.jp/69/93/2323/FastCopy341.zip"),
             # HWiNFO
-            @("hwinfo.zip", "ftp://ftp.sac.sk/sac/utildiag/hwi_572.zip"),
+            @("hwinfo.zip", "http://app.oldfoss.com:81/download/HWiNFO/hwi_574.zip"),
             # Killer Network Drivers
             @(
                 "killerinf.zip",
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index fec3209d..6825f9ba 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -411,14 +411,8 @@ def update_hwinfo():
     for exe in ['HWiNFO32.exe', 'HWiNFO64.exe']:
         kill_process(exe)
     
-    # Get url
-    url = resolve_dynamic_url(
-        SOURCE_URLS['HWiNFO'],
-        '.*download.fosshub.*HWiNFO/hwi.*zip')
-    url = re.sub(r'.*src="([^"]+)".*', r'\1', url)
-    
     # Download
-    download_to_temp('HWiNFO.zip', url)
+    download_to_temp('HWiNFO.zip', SOURCE_URLS['HWiNFO'])
     
     # Extract files
     extract_temp_to_bin('HWiNFO.zip', 'HWiNFO')
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index f82f1a02..2e3a7566 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -17,7 +17,7 @@ SOURCE_URLS = {
     'FastCopy32': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341.zip',
     'FastCopy64': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341_x64.zip',
     'Firefox uBO': 'https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.15.10-an+fx.xpi?filehash=sha256%3A30b258803fd6cd988c5ba479f2f6ff5b4e9b40110c81e3421a6867b20ec718a6',
-    'HWiNFO': 'https://www.fosshub.com/HWiNFO.html/hwi_572.zip',
+    'HWiNFO': 'http://app.oldfoss.com:81/download/HWiNFO/hwi_574.zip',
     'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
     'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
     'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.3.0.13.paf.exe',