Merge pull request #20 from hsaito/blender_location_override

Blenderインストール先の手動指定 resolve #8
kazu0617 · Sep 22, 2022 · eef9c41 · eef9c41
2 parents 6095f9f + 231ed42
commit eef9c41
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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アドオンの最新版を取得中…"