stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-21 20:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Logan-A 2023-12-31 11:05:20 -05:00
commit 106a98ce5c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
comptime.bat
View file

@ -16,7 +16,7 @@ set GIT=%2
if "%GIT%"=="" set GIT=git if "%GIT%"=="" set GIT=git
for /f "tokens=* usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s for /f "tokens=* usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s
for /f "tokens=* usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s for /f "tokens=* usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s
for /f "tokens=* usebackq" %%s in (`%GIT% log -1 --format^=%%s`) do @set GL1=%%s for /f "tokens=* usebackq" %%s in (`%GIT% log -1 --format^=%%f`) do @set GL1=%%s
set REV=%REV:~0,8% set REV=%REV:~0,8%
goto filwri goto filwri

2
comptime.sh
View file

@ -19,7 +19,7 @@ EOF
versiongit() { versiongit() {
gitbranch="$(git rev-parse --abbrev-ref HEAD)" gitbranch="$(git rev-parse --abbrev-ref HEAD)"
gitversion="$(git rev-parse HEAD | cut -c -8)" gitversion="$(git rev-parse HEAD | cut -c -8)"
gitsubject="$(git log -1 --format=%s)" gitsubject="$(git log -1 --format=%f)"
version "$gitbranch" "$gitversion" "$gitsubject"; version "$gitbranch" "$gitversion" "$gitsubject";
exit 0 exit 0
} }