update code base to Marlin 2.0.9.2

This commit is contained in:
Stefan Kalscheuer
2021-10-03 18:57:12 +02:00
parent b9d7ba838e
commit 7077da3591
2617 changed files with 332093 additions and 103438 deletions

View File

@@ -67,11 +67,11 @@ if [[ $BRANCH == $TARG ]]; then
# Allow working directly with the main fork
echo
echo -n "Pushing to origin/$TARG... "
git push -f origin
git push origin HEAD:$TARG
echo
echo -n "Pushing to upstream/$TARG... "
git push -f upstream
git push upstream HEAD:$TARG
else
@@ -126,7 +126,7 @@ git push -f origin
git push -f upstream | {
while IFS= read -r line
do
[[ $line =~ "gh-pages -> gh-pages" ]] && opensite "http://marlinfw.org/"
[[ $line =~ "gh-pages -> gh-pages" ]] && opensite "https://marlinfw.org/"
echo "$line"
done
}
@@ -135,4 +135,4 @@ git push -f upstream | {
rm -rf ${TMPFOLDER}
# Go back to the branch we started from
[[ $BRANCH != $CURR ]] && git checkout $BRANCH && [[ $HAS_STASH == 1 ]] && git stash pop
git checkout $CURR && [[ $HAS_STASH == 1 ]] && git stash pop