Merge pull request #37 from neuralpain/v0.21.2-beta

Fix patch validation and pos launch bug

Author: neuralpain

.gitignore

@@ -1,7 +1,7 @@
 # testing
 *.exe
 *.zip
-log.txt
+˜log.txt
 
 # build files
 build/
@@ -13,6 +13,7 @@ intuit
 QuickBooks Tool Hub
 
 # misc
+.DS_Store
 .history/
 target/
-.DS_Store
+earlier_releases/

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## v0.21.1
+## v0.21.2
+- Fix validation bug on local patch files
+- Fix bug preventing launch of QuickBooks POS application after installation
+- Minor bug fixes
+
+#### v0.21.1
 - Fix licensing issues for POS v19 ([#30](https://github.com/neuralpain/qbactivator/issues/30)) and custom licenses ([#31](https://github.com/neuralpain/qbactivator/issues/31))
 - Code refactoring
 

README.md

@@ -8,7 +8,7 @@
 Activation script for QuickBooks Point of Sale Software on Windows. — [Download Now!][download]
 
 > [!CAUTION]  
-> **DO NOT** clone or download this repository in an attempt to run `qbactivator` (Ref: [#10][issue_10]). Downloading this repository is not necessary to run the script. The source files are not meant to be run individually and `qbactivator` will not run correctly if executed this way.
+> **Do not** clone or download this repository in an attempt to run `qbactivator` (Ref: [#10][issue_10]). Downloading this repository is not necessary to run the script. The source files are not meant to be run individually and `qbactivator` will not run correctly if executed this way.
 > If you want to run the script, please [read the Wiki][getstarted] to get started using `qbactivator` or proceed to [download the latest release package][release].
 
 ### Features
@@ -93,7 +93,7 @@ Licensed under [BSD 2-Clause](LICENSE).
 [getstarted]: https://github.com/neuralpain/qbactivator/wiki#getting-started
 [update]: https://github.com/neuralpain/qbactivator/wiki#downloads--updates
 [instructions]: https://github.com/neuralpain/qbactivator/wiki/How-to-Use
-[download]: https://github.com/neuralpain/qbactivator/releases/download/v0.21.1/qbactivator-0.21.1.min.zip
+[download]: https://github.com/neuralpain/qbactivator/releases/download/v0.21.2/qbactivator-0.21.2.min.zip
 [release]: https://github.com/neuralpain/qbactivator/releases/latest
 [powershell]: https://github.com/PowerShell/PowerShell/releases/latest
 [updatepowershell]: https://github.com/neuralpain/qbactivator/wiki/Updating-PowerShell

VERSION

@@ -1 +1 @@
-0.21.1
+0.21.2

src/main/Main.ps1

@@ -67,10 +67,10 @@ function Invoke-QuickBooksInstaller {
       Write-Host -NoNewLine "Verifying `"$exe`"... "
 
       foreach ($hash in $qbHashList) {
-        $isValid = (Compare-IsValidHash -Hash $hash -File .\$exe)
+        $isValid = (Compare-IsValidHash $hash .\$exe)
         if ($isValid) {
           Write-Host "OK"
-          Get-IntuitLicense -Hash $hash
+          Get-IntuitLicense $hash
           Install-IntuitLicense
           break 
         }

src/main/functions/ClientModuleOperations.ps1

@@ -45,8 +45,8 @@ function Install-ClientModule {
   Rename-Item $CLIENT_MODULE "${CLIENT_MODULE}.bak" >$null 2>&1
 
   if (Test-Path "$PATCH_FILE" -PathType Leaf) {
-    $result = Compare-IsValidHash -Hash $PATCH_HASH -File $PATCH_FILE
-    if ($result -ne $ERR) { Copy-Item $PATCH_FILE $CLIENT_MODULE } 
+    $isValid = Compare-IsValidHash $PATCH_HASH $PATCH_FILE
+    if ($isValid) { Copy-Item $PATCH_FILE $CLIENT_MODULE } 
     else { 
       Write-Host "`nPatch file may be corrupted."
       Get-ClientModule

src/main/functions/Downloader.ps1

@@ -96,11 +96,11 @@ function Start-InstallerDownload {
     $estimated_download_time = Get-TimeToComplete $Script:INSTALLER_BITS $Script:BANDWIDTH_BITS
     Write-Host "`nDST: $Target`nETC: $estimated_download_time @ $($Script:BANDWIDTH) Mbps" -ForegroundColor White
   } else {
-    Write-Host "`nDST: $Target`nETC: UNKNOWN @ >0.01 Mbps" -ForegroundColor White
+    Write-Host "`nDST: $Target`nETC: UNKNOWN_DURATION @ >0.01 Mbps" -ForegroundColor White
   }
 
   Write-Host "`nEstimated time is calculated from the point that your`ninternet speed was tested. This is just an estimation and`nmay not reflect the actual time that it would take for the`ndownload to complete on your system. This is subject to`nchange as your internet speed fluctuates."
-  Write-Host "`nPlease wait while the installer is being downloaded.`nThe installer will be satrted automatically after the`ndownload is complete.`n" -ForegroundColor Yellow
+  Write-Host "`nPlease wait while the installer is being downloaded.`nThe installer will be started automatically after the`ndownload is complete.`n" -ForegroundColor Yellow
 
   $installer_download_path = "$Target\QuickBooksPOSV${Version}.exe"
   $installer_download_url = "https://dlm2.download.intuit.com/akdlm/SBD/QuickBooks/${Year}/Latest/QuickBooksPOSV${Version}.exe"

src/main/functions/InformationDisplay.ps1

@@ -33,6 +33,7 @@ function Write-MainMenu {
   Write-Host "3 - I have my own license :p"
   Write-Host "4 - General QuickBooks activation"
   # Write-Host "    ^^^^ Pro/Enterprise/Other ^^^"
+  Write-Host "5 - Terminate QuickBooks Processes"
   Write-Host "0 - Exit"
   $query = Read-Host "`n#"
 
@@ -44,12 +45,22 @@ function Write-MainMenu {
       Invoke-QuickBooksInstaller
     }
     3 { 
-      Clear-Host; Write-Host; 
       Write-LieResponse
       Invoke-QuickBooksInstaller
     }
-    4 { Write-Action_OptionUnavailable; Write-MainMenu }
-    # 4 { Clear-Host; Write-Host; Invoke-Activation -GeneralActivation }
+    4 { 
+      Write-Action_OptionUnavailable
+      Write-MainMenu 
+    }
+    40 { 
+      Clear-Host; Write-Host
+      Invoke-Activation -GeneralActivation 
+    }
+    5 { 
+      Clear-Host; Write-Host
+      Stop-QuickBooksProcesses
+      Write-MainMenu 
+    }
     default { Write-MainMenu }
   }
 }

src/main/main.cmd

@@ -1,4 +1,4 @@
-@title "QuickBooks POS Activator v%uivr%"
+@title QuickBooks POS Activator v%uivr%
 @mode 60,18
 set "wdir=%~dp0"
 set "pwsh=PowerShell -NoP -C"
@@ -53,10 +53,15 @@ set "CLIENT_MODULE=%SystemRoot%\Microsoft.NET\assembly\GAC_MSIL\Intuit.Spc.Map.E
 
 :: start quickbooks
 echo Starting QuickBooks...
-if exist "%QBPOSDIR19%" ( %pwsh% "Start-Process -FilePath '%QBPOSDIR19%'") 
-else if exist "%QBPOSDIR18%" ( %pwsh% "Start-Process -FilePath '%QBPOSDIR18%'") 
-else if exist "%QBPOSDIR12%" ( %pwsh% "Start-Process -FilePath '%QBPOSDIR12%'") 
-else if exist "%QBPOSDIR11%" ( %pwsh% "Start-Process -FilePath '%QBPOSDIR11%'")
+if exist "%QBPOSDIR19%" (
+  %pwsh% "Start-Process -FilePath '%QBPOSDIR19%'"
+) else if exist "%QBPOSDIR18%" (
+  %pwsh% "Start-Process -FilePath '%QBPOSDIR18%'"
+) else if exist "%QBPOSDIR12%" (
+  %pwsh% "Start-Process -FilePath '%QBPOSDIR12%'"
+) else if exist "%QBPOSDIR11%" (
+  %pwsh% "Start-Process -FilePath '%QBPOSDIR11%'"
+)
 
 :: export and open minified readme
 pushd "%wdir%"