OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- update windows update-subtrees.cmd to instead point to the bash script, it will execute git-bash to run it

Browse source 
- always use absolute url's for subtrees, don't lock ourselves to github
This commit is contained in:
Rachael Alexanderson 2025-08-12 04:36:55 -04:00
commit 8d15a41f1b
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/update-subtrees.cmd
View file

@ -1,3 +1,7 @@
@echo off
git subtree pull --prefix=libraries/ZWidget https://github.com/dpjudas/ZWidget master --squash
git subtree pull --prefix=libraries/ZMusic https://github.com/ZDoom/ZMusic master --squash
setlocal
cd "%~dp0"
for /f "delims=" %%I in ('where git.exe') do set GIT_PATH="%%~dpI"
if errorlevel 1 echo "Unable to find git.exe!"
if errorlevel 1 goto :eof
%GIT_PATH%\..\bin\bash.exe update-subtrees.sh %*

6
tools/update-subtrees.sh
View file

@ -6,11 +6,11 @@ pull() {
if [[ "${1}" == "${2}" || "${1}" == "all" ]]
then
echo "fetching ${2}"
git subtree pull --prefix="${3}" "https://github.com/${4}" "${5}" --squash || exit
git subtree pull --prefix="${3}" "${4}" "${5}" --squash || exit
else
echo "${2} not specified, skipping"
fi
}
pull "$1" 'zwidget' 'libraries/ZWidget' 'dpjudas/ZWidget' 'master'
pull "$1" 'zmusic' 'libraries/ZMusic' 'ZDoom/ZMusic' 'master'
pull "$1" 'zwidget' 'libraries/ZWidget' 'https://github.com/dpjudas/ZWidget' 'master'
pull "$1" 'zmusic' 'libraries/ZMusic' 'https://github.com/ZDoom/ZMusic' 'master'