diff --git a/_convert.bat b/_convert.bat index db9fce9..8069d11 100644 --- a/_convert.bat +++ b/_convert.bat @@ -9,6 +9,8 @@ for /f "usebackq delims=" %%A in (`powershell -command "(Get-ItemProperty HKLM:\ for /f "usebackq delims=" %%A in (`powershell -command "(Get-ItemProperty HKLM:\Software\\Microsoft\Windows\CurrentVersion\Uninstall\* | Select-Object DisplayName,DisplayVersion,InstallLocation | Where-Object {$_.DisplayName -eq \"Blender\"} | Sort -Property DisplayVersion | Select-Object -Last 1 ).InstallLocation"`) do set blender=%%A set blender=%blender:"=% +if defined BLENDER_LOCATION_OVERRIDE (set blender=%BLENDER_LOCATION_OVERRIDE%) + for /f "usebackq delims=" %%A in (`curl --version`) do set curlresult=%%A for /f "usebackq delims=" %%A in (`ver`) do set windowsversion=%%A diff --git a/_convert_manual.bat b/_convert_manual.bat index 2572ead..746e576 100644 --- a/_convert_manual.bat +++ b/_convert_manual.bat @@ -8,6 +8,8 @@ for /f "usebackq delims=" %%A in (`powershell -command "(Get-ItemProperty HKLM:\ for /f "usebackq delims=" %%A in (`powershell -command "(Get-ItemProperty HKLM:\Software\\Microsoft\Windows\CurrentVersion\Uninstall\* | Select-Object DisplayName,DisplayVersion,InstallLocation | Where-Object {$_.DisplayName -eq \"Blender\"} | Sort -Property DisplayVersion | Select-Object -Last 1 ).InstallLocation"`) do set blender=%%A set blender=%blender:"=% +if defined BLENDER_LOCATION_OVERRIDE (set blender=%BLENDER_LOCATION_OVERRIDE%) + for /f "usebackq delims=" %%A in (`curl --version`) do set curlresult=%%A for /f "usebackq delims=" %%A in (`ver`) do set windowsversion=%%A diff --git a/_license-check.bat b/_license-check.bat index 904e4bf..5c35096 100644 --- a/_license-check.bat +++ b/_license-check.bat @@ -9,6 +9,8 @@ for /f "usebackq delims=" %%A in (`powershell -command "(Get-ItemProperty HKLM:\ for /f "usebackq delims=" %%A in (`powershell -command "(Get-ItemProperty HKLM:\Software\\Microsoft\Windows\CurrentVersion\Uninstall\* | Select-Object DisplayName,DisplayVersion,InstallLocation | Where-Object {$_.DisplayName -eq \"Blender\"} | Sort -Property DisplayVersion | Select-Object -Last 1 ).InstallLocation"`) do set blender=%%A set blender=%blender:"=% +if defined BLENDER_LOCATION_OVERRIDE (set blender=%BLENDER_LOCATION_OVERRIDE%) + timeout 3 echo "VRMアドオンの最新版を取得中…"