Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 05:33:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

improve OS.get_name classref, misc/scripts fixes, remove trailing quote

Browse Source
This commit is contained in:
Nathan Franke 2022-04-22 17:13:08 -05:00
parent f4b0c7a1ea
commit 1304d72fc1
No known key found for this signature in database
GPG Key ID: 082B90CF10A5B648
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/OS.xml
View File

@ -278,7 +278,7 @@
<return type="String" />
<description>
Returns the name of the host OS.
On Windows, this is [code]"Windows"[/code] or [code]"UWP"[/code] (Universal Windows Platform) if exported thereon.
On Windows, this is [code]"Windows"[/code] or [code]"UWP"[/code] if exported on Universal Windows Platform.
On macOS, this is [code]"macOS"[/code].
On Linux-based operating systems, this is [code]"Linux"[/code].
On BSD-based operating systems, this is [code]"FreeBSD"[/code], [code]"NetBSD"[/code], [code]"OpenBSD"[/code], or [code]"BSD"[/code] as a fallback.

4
misc/scripts/black_format.sh
View File

@ -11,13 +11,13 @@ black -l 120 $PY_FILES
diff=$(git diff --color)
# If no patch has been generated all is OK, clean up, and exit.
# If no diff has been generated all is OK, clean up, and exit.
if [ -z "$diff" ] ; then
printf "Files in this commit comply with the black style rules.\n"
exit 0
fi
# A patch has been created, notify the user, clean up, and exit.
# A diff has been created, notify the user, clean up, and exit.
printf "\n*** The following differences were found between the code "
printf "and the formatting rules:\n\n"
echo "$diff"

6
misc/scripts/clang_format.sh
View File

@ -30,13 +30,13 @@ done
diff=$(git diff --color)
# If no patch has been generated all is OK, clean up, and exit.
# If no diff has been generated all is OK, clean up, and exit.
if [ -z "$diff" ] ; then
printf "Files in this commit comply with the clang-tidy style rules.\n"
printf "Files in this commit comply with the clang-format style rules.\n"
exit 0
fi
# A patch has been created, notify the user, clean up, and exit.
# A diff has been created, notify the user, clean up, and exit.
printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
echo "$diff"
printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"

4
misc/scripts/clang_tidy.sh
View File

@ -18,13 +18,13 @@ done
diff=$(git diff --color)
# If no patch has been generated all is OK, clean up, and exit.
# If no diff has been generated all is OK, clean up, and exit.
if [ -z "$diff" ] ; then
printf "Files in this commit comply with the clang-tidy style rules.\n"
exit 0
fi
# A patch has been created, notify the user, clean up, and exit.
# A diff has been created, notify the user, clean up, and exit.
printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
echo "$diff"
printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"

5
misc/scripts/file_format.sh
View File

@ -49,14 +49,13 @@ done
diff=$(git diff --color)
# If no patch has been generated all is OK, clean up, and exit.
# If no diff has been generated all is OK, clean up, and exit.
if [ -z "$diff" ] ; then
printf "Files in this commit comply with the formatting rules.\n"
rm -f patch.patch
exit 0
fi
# A patch has been created, notify the user, clean up, and exit.
# A diff has been created, notify the user, clean up, and exit.
printf "\n*** The following differences were found between the code "
printf "and the formatting rules:\n\n"
echo "$diff"

2
modules/gdscript/gdscript_tokenizer.cpp
View File

@ -1493,7 +1493,7 @@ GDScriptTokenizer::Token GDScriptTokenizer::scan() {
}
default:
return make_error(vformat(R"(Unknown character "%s".")", String(&c, 1)));
return make_error(vformat(R"(Unknown character "%s".)", String(&c, 1)));
}
}