Revision #1.4.3: See changelog on README.md

thefirefox12537 · Dec 25, 2021 · 923b4e4 · 923b4e4
1 parent 0e274f8
commit 923b4e4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -151,8 +151,10 @@ powershell -command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityP
 
 
 ## Changelog:
+### v1.4.3
+Pembaharuan minor ketiga
 ### v1.4.2
-  *  Pembaharuan minor ketiga
+  *  Pembaharuan minor kedua
   *  Perbaikan baris skrip
   *  Penambahan protokol keamanan jaringan (Windows)
   *  Perubahan menjalankan skrip secara online **(Lihat di [README.md](https://github.com/thefirefox12537/ota_f17a1h_injector#jika-kalian-tidak-sempat-mendownload-skrip-kalian-bisa-salin-perintah-dibawah-ini-dan-tempelkan-ke-command-promptterminal-dan-tambahkanketik-nama-file-updatezip-yang-akan-di-inject).)**

diff --git a/inject-android/README.md b/inject-android/README.md
@@ -20,7 +20,7 @@ inject.sh --readme
 
 
 ## Contact ##
-[Facebook](https://fb.me/thefirefoxflasher)
-[Instagram](https://www.instagram.com/thefirefoxflasher_)
-[WhatsApp](https://bit.ly/wa_thefirefoxflasher)
-[E-Mail](mailto:reinmclaren33@gmail.com)
+  *  [Facebook](https://fb.me/thefirefoxflasher)
+  *  [Instagram](https://www.instagram.com/thefirefoxflasher_)
+  *  [WhatsApp](https://bit.ly/wa_thefirefoxflasher)
+  *  [E-Mail](mailto:reinmclaren33@gmail.com)
diff --git a/inject-android/module.prop b/inject-android/module.prop
@@ -1,7 +1,7 @@
 id=otaf17a1h-inject
 name=OTA Haier F17A1H / Andromax Prime Injector Tool
-version=v1.4.2
-versionCode=142
+version=v1.4.3
+versionCode=143
 author=thefirefox12537
 description=Inject the update.zip for Haier F17A1H / Andromax Prime
 support=reinmclaren33@gmail.com

diff --git a/inject-win.bat b/inject-win.bat
@@ -15,7 +15,7 @@
 @ :: Haier_F17A1H OTA Updater Injector
 @ ::
 @ :: Date/Time Created:          01/26/2021  1:30pm
-@ :: Date/Time Modified:         12/25/2021  5:40am
+@ :: Date/Time Modified:         12/25/2021  8:00am
 @ :: Operating System Created:   Windows 10 Pro
 @ ::
 @ :: This script created by:
@@ -25,15 +25,15 @@
 @ ::
 @ :: VersionInfo:
 @ ::
-@ ::    File version:      1,4,2
-@ ::    Product Version:   1,4,2
+@ ::    File version:      1,4,3
+@ ::    Product Version:   1,4,3
 @ ::
 @ ::    CompanyName:       The Firefox Flasher
 @ ::    FileDescription:   Haier_F17A1H OTA Updater Injector
-@ ::    FileVersion:       1.4.2
+@ ::    FileVersion:       1.4.3
 @ ::    InternalName:      inject
 @ ::    OriginalFileName:  inject.bat
-@ ::    ProductVersion:    1.4.2
+@ ::    ProductVersion:    1.4.3
 @ ::
 
 
@@ -174,19 +174,22 @@ if not exist "%basedir%\adb.exe" (
       '%temp%\' ^
     ^)
     for %%d in (platform-tools android-sdk\platform-tools) do if exist "%temp%\%%d"  (
-    for %%f in (adb.exe AdbWinApi.dll AdbWinUsbApi.dll) do ^
-    move "%temp%\%%d\%%f" "%basedir%\" > nul 2>&1
+    for %%f in (adb.exe AdbWinApi.dll AdbWinUsbApi.dll) do move "%temp%\%%d\%%f" "%basedir%\" > nul 2>&1
     rd /s /q "%temp%\%%d"  > nul 2>&1
     )
     del /q "%temp%\platform-tools.zip" > nul 2>&1
-    if not exist "%basedir%\adb.exe" (
-        echo Failed getting ADB program. Please try again, make sure your network connected.
-        @ goto :eof
-    ) else (
-        echo ADB program was successfully placed.
-    )
+    set ADB_SUCCESS=1
 ) else ( echo ADB program was availabled on the computer or this folder. )
 
+if defined ADB_SUCCESS ^
+if not exist "%basedir%\adb.exe" (
+    echo Failed getting ADB program. Please try again, make sure your network connected.
+    @ goto :eof
+) else (
+    echo ADB program was successfully placed.
+)
+
+:checkadbdriver
 echo Checking ADB Interface driver installed...
 
 :: Downloading ADB Interface driver
@@ -219,15 +222,20 @@ if %ERRORLEVEL% NEQ 0 (
 
     rd /s /q "%temp%\usb_driver" > nul 2>&1
     del /q "%temp%\usb_driver.zip" > nul 2>&1
-    where /r "%SystemRoot%\system32\DriverStore\FileRepository" android_winusb.inf > nul 2>&1
-    if %ERRORLEVEL% NEQ 0 (
-        echo Failed installing driver. Please try again.
-        @ goto :eof
-    ) else (
-        echo Driver successfully installed.
-    )
+    set DRIVER_SUCCESS=1
 ) else ( echo Driver already installed. )
 
+set "commands=call powershell -noprofile -command "pnputil.exe -e ^| ^
+Select-String -Context 1 'Driver package provider :\s+ Google, Inc.' ^| ^
+foreach{^($_.Context.PreContext[0] -split ' : +'^)[1]}""
+if defined DRIVER_SUCCESS for /f usebackq %%a in (`%commands%`) do ^
+if not exist %SystemRoot%\inf\%%a (
+    echo Failed installing driver. Please try again.
+    @ goto :eof
+) else (
+    echo Driver successfully installed.
+)
+
 :: Starting ADB service
 :start_adb
 echo Starting ADB services...

diff --git a/inject-win.ps1 b/inject-win.ps1
@@ -1,7 +1,7 @@
 #!/usr/bin/env pwsh
 #requires -version 4
 <#PSScriptInfo
-.VERSION 1.4.2
+.VERSION 1.4.3
 .GUID 702d7de5-2805-4d25-92fa-4aa08148b894
 .AUTHOR Faizal Hamzah
 .PROJECTURI http://github.com/thefirefox12537/ota_f17a1h_injector.git
@@ -25,7 +25,7 @@ Run inject-win.ps1 without arguments to view help usage.
 #>
 <#
 Date created:   12/08/2021  4:11pm
-Date modified:  12/25/2021  5:40am
+Date modified:  12/25/2021  8:00am
 #>
 
 if ($IsLinux -or $IsmacOS)