Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into 1.0.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	Win7_OEM_Activator.bat
#	lib/log.txt
#	log.txt
  • Loading branch information
mosesIRL committed Mar 3, 2017
2 parents 9d072bf + ff70e5c commit 90da5a1
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions lib/checkstatus.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
cls
goto %~1
:RETAILCHECK
type %~dp0headertitle.txt
echo.
echo.
echo License installed, checking activation status...
Expand All @@ -11,11 +12,13 @@ for /f "tokens=3 delims=: " %%a in (
) do set "licenseStatus=%%a"

if /i "%licenseStatus%"=="Licensed" (
echo Retailed key activation successful. >> %~dp0log.txt
echo License activated successfully!
goto ACTIVATIONCOMPLETE
) else (
goto FAILEDRESTARTPROMPT )
cls
echo Retailed key activation successful. >> %~dp0log.txt
echo License activated successfully!
goto ACTIVATIONCOMPLETE
) else (
goto FAILEDRESTARTPROMPT
)

:FAILEDRESTARTPROMPT
echo Retail license key activation failed. >> %~dp0log.txt
Expand All @@ -28,7 +31,7 @@ if /I "%restartprompt%" EQU "Y" call "%~dp0Win7_OEM_Activator.bat"
if /I "%restartprompt%" EQU "N" goto ACTIVATIONCOMPLETE

:CHECKOEM
type "%~dp0lib\headertitle.txt"
type %~dp0headertitle.txt
echo.
echo.
echo License installed, checking activation status...
Expand All @@ -39,7 +42,8 @@ for /f "tokens=3 delims=: " %%a in (

if /i "%licenseStatus%"=="Licensed" (
echo License A activation check successful >> %~dp0log.txt
type "%~dp0lib\headertitle.txt"
cls
type %~dp0headertitle.txt
echo.
echo.
echo. License activated successfully!
Expand All @@ -57,7 +61,7 @@ call "%~dp0lib\installcert.bat" InstallB
goto UNSUPPORTED
)
:BVARIANTTEST
type "%~dp0lib\headertitle.txt"
type %~dp0headertitle.txt
echo.
echo.
echo Alternate license installed, checking activation status...
Expand All @@ -67,7 +71,7 @@ for /f "tokens=3 delims=: " %%a in (
) do set "licenseStatus=%%a"

if /i "%licenseStatus%"=="Licensed" (
type "%~dp0lib\headertitle.txt"
type %~dp0headertitle.txt
echo.
echo.
echo License B activation check successful. >>%~dp0log.txt
Expand All @@ -80,7 +84,7 @@ if /i "%licenseStatus%"=="Licensed" (
goto UNSUPPORTED
)
:UNSUPPORTED
type "%~dp0lib\headertitle.txt"
type %~dp0headertitle.txt
echo.
echo.
echo. License activation failed. This may be due to an
Expand Down

0 comments on commit 90da5a1

Please sign in to comment.