mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-05-07 02:16:02 +08:00
694cc766a4
This makes them pass shellcheck. Except for a few unused export warnings. I also wonder if the majority of these files should be in the root of the project, or should be moved to "build-scripts" (or should still even exist). a few minor changes one more minor changes
24 lines
616 B
Bash
Executable File
24 lines
616 B
Bash
Executable File
#!/usr/bin/env bash
|
|
curbranch=$(git branch --show-current)
|
|
|
|
if [[ "${curbranch}" == "master" || "${curbranch}" == "develop" ]]; then
|
|
rm -f include/build_timestamp.h
|
|
git checkout include/build_timestamp.h
|
|
|
|
git checkout develop
|
|
git pull
|
|
git push
|
|
|
|
rm -f include/build_timestamp.h
|
|
git checkout include/build_timestamp.h
|
|
|
|
git checkout master
|
|
git pull
|
|
git push
|
|
|
|
rm -f include/build_timestamp.h
|
|
git checkout include/build_timestamp.h
|
|
|
|
git checkout master && git merge develop && git checkout develop && git merge master && git fetch --all && git push --all && make -j
|
|
fi
|