diff --git a/articles/markdown.md b/articles/others/markdown.md similarity index 94% rename from articles/markdown.md rename to articles/others/markdown.md index 68803e9..7091a0b 100644 --- a/articles/markdown.md +++ b/articles/others/markdown.md @@ -32,4 +32,6 @@ $\left 1 2 3 4 5 6 7 8 9 \right$ ## 其他 -- [A WYSIWYG Markdown editor, improve reading and editing experience. and generate your Markdown files into online documents in the easiest and fastest way一个所见即所得的 Markdown 桌面编辑器,集成了 Mermaid 图形与 Katex 公式,支持明亮和暗黑风格。](https://github.com/1943time/bluestone) \ No newline at end of file +- [A WYSIWYG Markdown editor, improve reading and editing experience. and generate your Markdown files into online documents in the easiest and fastest way一个所见即所得的 Markdown 桌面编辑器,集成了 Mermaid 图形与 Katex 公式,支持明亮和暗黑风格。](https://github.com/1943time/bluestone) + +# [Marked Documentation](https://marked.js.org/) \ No newline at end of file diff --git a/dev-note/bazel.md b/dev-note/bazel.md deleted file mode 100644 index 981f0e6..0000000 --- a/dev-note/bazel.md +++ /dev/null @@ -1,4 +0,0 @@ -# [bazel](https://bazel.google.cn/?hl=en) -> a fast, scalable, multi-language and extensible build system. - -[github代码](https://github.com/bazelbuild/bazel) diff --git a/dev-note/buildSystem.md b/dev-note/buildSystem.md index df6e53e..535c024 100644 --- a/dev-note/buildSystem.md +++ b/dev-note/buildSystem.md @@ -13,4 +13,10 @@ ## [Ninja](https://ninja-build.org/) > Ninja is a small build system with a focus on speed -[github](https://github.com/ninja-build/ninja) \ No newline at end of file +[github](https://github.com/ninja-build/ninja) +[How To Install ninja-build on Ubuntu 20.04](https://installati.one/install-ninja-build-ubuntu-20-04/) + +## [bazel](https://bazel.google.cn/?hl=en) +> a fast, scalable, multi-language and extensible build system. + +[github代码](https://github.com/bazelbuild/bazel) diff --git a/dev-note/git.md b/dev-note/git.md index 2055a26..ccf19b6 100644 --- a/dev-note/git.md +++ b/dev-note/git.md @@ -222,4 +222,21 @@ ssh -T git@github.com # 测试生成的是否连同 mkdir repo-foloder && cd repo-folder git init git remote add origin git@github.com:Username/Repositories_Name.git # 现在这样仓库就处理好了。 -``` \ No newline at end of file +``` + +# Subversion + + +## 常用命令 + +- svn up(update) +- svn update -r r644 // 切换到版本644 +- svn co(checkout) svn-path // checkout到指定路径 +- svn add file // 添加文件 +- svn commit -m "message" // 直接提交 +- svn st(status) // 状态 +- svn diff +- svn log file-path // 查看某个文件的历史记录 +- svn revert +- svn merge -r 608:602 "" // 从r608回滚到r602 +- svn info // diff --git a/dev-note/index.md b/dev-note/index.md index bb1f2eb..083d866 100644 --- a/dev-note/index.md +++ b/dev-note/index.md @@ -1,10 +1,8 @@ # dev-note - [git](/dev-note/git.md) -- [svn](/dev-note/svn.md) - [cmake](/dev-note/cmake.md) - [linux](/dev-note/linux.md) -- [ssh](/dev-note/ssh.md) - [powershell](/dev-note/powershell.md) - [wsl](/dev-note/wsl.md) - [vscode](/dev-note/vscode.md) diff --git a/dev-note/linux.md b/dev-note/linux.md index 677752c..2ff755a 100644 --- a/dev-note/linux.md +++ b/dev-note/linux.md @@ -60,7 +60,6 @@ sudo do-release-upgrade // 这步之后就按y(yes)N(no)或d(detail) 来确认 ```shell find . -name "*libc*" ``` - - grep - **grep -rn "xxx"**递归查找字符串xxx - **--exclude=*.{min.js}**排除文件类型 @@ -113,6 +112,17 @@ export PATH=$PATH:/home/lmj/anacoda2 unset DOWNLOAD ``` +### ssh(Secure Shell Protocol) + +```shell +sudo apt-get update +sudo apt-get install openssh-server +sudo systemctl status ssh +sudo ufw allow ssh 防火墙 -- ubuntu +sudo systemctl disable --now ssh 禁用ssh +sudo systemctl enable --now ssh 启用 +ssh lmj01@github.com 登录 +``` 永久设置环境变量,可直接更改系统启动文件或当前用户的启动文件 - /etc/profile diff --git a/dev-note/ssh.md b/dev-note/ssh.md deleted file mode 100644 index eb1e8c1..0000000 --- a/dev-note/ssh.md +++ /dev/null @@ -1,11 +0,0 @@ -# ssh(Secure Shell Protocol) - -```shell -sudo apt-get update -sudo apt-get install openssh-server -sudo systemctl status ssh -sudo ufw allow ssh 防火墙 -- ubuntu -sudo systemctl disable --now ssh 禁用ssh -sudo systemctl enable --now ssh 启用 -ssh lmj01@github.com 登录 -``` \ No newline at end of file diff --git a/dev-note/svn.md b/dev-note/svn.md deleted file mode 100644 index 0d199f6..0000000 --- a/dev-note/svn.md +++ /dev/null @@ -1,16 +0,0 @@ -# Subversion - - -## 常用命令 - -- svn up(update) -- svn update -r r644 // 切换到版本644 -- svn co(checkout) svn-path // checkout到指定路径 -- svn add file // 添加文件 -- svn commit -m "message" // 直接提交 -- svn st(status) // 状态 -- svn diff -- svn log file-path // 查看某个文件的历史记录 -- svn revert -- svn merge -r 608:602 "" // 从r608回滚到r602 -- svn info // diff --git a/index.mjs b/index.mjs index 9c72dee..8ae686b 100644 --- a/index.mjs +++ b/index.mjs @@ -1,3 +1,4 @@ +import {} from './marked.v4.3.0.min.js'; import hljs from './highlight/core.min.mjs'; import languageJavascript from './highlight/languages/javascript.min.mjs'; import languageLua from './highlight/languages/lua.min.mjs'; diff --git a/index/article.md b/index/article.md index 56fc3e7..2ff9a19 100644 --- a/index/article.md +++ b/index/article.md @@ -2,7 +2,7 @@ - [资源与工具](/articles/resource.md) - [3D引擎](/cg/engines.md) -- [Markdown](/articles/markdown.md) +- [Markdown](/articles/others/markdown.md) - [Mathjax](/articles/mathjax.md) - [数学笔记](/articles/notes/math.md) - [excel笔记](/articles/notes/excel.md)