summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-04-26 22:40:35 +0800
committerruki <[email protected]>2017-04-26 22:40:35 +0800
commit67327cae080901ac773b482804d427d172bf29e3 (patch)
treeb49b9d4fab0a10fa09fcceec48f1cfcb8c68256b
parent6346af0f672353eedc5c3a6efe4ed3d5a0a52e5a (diff)
modify logo for get script and modify homepage
-rw-r--r--docs/README.md4
-rw-r--r--docs/cn/index.html26
-rw-r--r--docs/landing.html8
-rwxr-xr-xdocs/landing/index.cn.md6
-rwxr-xr-xdocs/landing/index.md6
-rwxr-xr-xdocs/zh/README.md4
-rw-r--r--scripts/get.ps116
-rwxr-xr-xscripts/get.sh16
8 files changed, 52 insertions, 34 deletions
diff --git a/docs/README.md b/docs/README.md
index b2b83e6f2..197a36c58 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -45,7 +45,7 @@ Or install master version:
$ brew install xmake --HEAD
# or download install directly
-$ bash <(curl -s https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
+$ bash <(curl -fsSL https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
```
#### Linux
@@ -102,7 +102,7 @@ Or install master version:
$ brew install xmake --HEAD
# or download install directly
-$ bash <(curl -s https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
+$ bash <(curl -fsSL https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
```
#### Compilation
diff --git a/docs/cn/index.html b/docs/cn/index.html
index 6ea91db86..65934a147 100644
--- a/docs/cn/index.html
+++ b/docs/cn/index.html
@@ -49,7 +49,13 @@
<section class="main-content">
- <h2 id="section">简单的工程描述</h2>
+ <h2 id="section">安装</h2>
+
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bash &lt;<span class="o">(</span>curl -s https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh<span class="o">)</span>
+</code></pre>
+</div>
+
+<h2 id="section-1">简单的工程描述</h2>
<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">target</span><span class="p">(</span><span class="s2">"console"</span><span class="p">)</span>
<span class="n">set_kind</span><span class="p">(</span><span class="s2">"binary"</span><span class="p">)</span>
@@ -57,25 +63,25 @@
</code></pre>
</div>
-<h2 id="section-1">构建工程</h2>
+<h2 id="section-2">构建工程</h2>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>xmake
</code></pre>
</div>
-<h2 id="section-2">运行目标</h2>
+<h2 id="section-3">运行目标</h2>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>xmake run console
</code></pre>
</div>
-<h2 id="section-3">调试程序</h2>
+<h2 id="section-4">调试程序</h2>
<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>xmake run -d console
</code></pre>
</div>
-<h2 id="section-4">支持特性</h2>
+<h2 id="section-5">支持特性</h2>
<ul>
<li>Tasks</li>
@@ -86,7 +92,7 @@
<li>Templates</li>
</ul>
-<h2 id="section-5">支持平台</h2>
+<h2 id="section-6">支持平台</h2>
<ul>
<li>Windows (x86, x64)</li>
@@ -98,7 +104,7 @@
<li>Mingw (i386, x86_64)</li>
</ul>
-<h2 id="section-6">支持语言</h2>
+<h2 id="section-7">支持语言</h2>
<ul>
<li>C/C++</li>
@@ -110,7 +116,7 @@
<li>Dlang</li>
</ul>
-<h2 id="section-7">内置插件</h2>
+<h2 id="section-8">内置插件</h2>
<ul>
<li>宏记录脚本和回放插件</li>
@@ -120,11 +126,11 @@
<li>iOS app2ipa插件</li>
</ul>
-<h2 id="section-8">使用演示</h2>
+<h2 id="section-9">使用演示</h2>
<p><a href="https://github.com/tboox/xmake"><img src="http://tboox.org/static/img/xmake/build_demo.gif" alt="usage_demo" /></a></p>
-<h2 id="section-9">联系方式</h2>
+<h2 id="section-10">联系方式</h2>
<ul>
<li>邮箱:<a href="mailto:[email protected]">[email protected]</a></li>
diff --git a/docs/landing.html b/docs/landing.html
index 400bc741f..6cabdf530 100644
--- a/docs/landing.html
+++ b/docs/landing.html
@@ -49,7 +49,13 @@
<section class="main-content">
- <h2 id="simple-description">Simple description</h2>
+ <h2 id="installation">Installation</h2>
+
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bash &lt;<span class="o">(</span>curl -s https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh<span class="o">)</span>
+</code></pre>
+</div>
+
+<h2 id="simple-description">Simple description</h2>
<div class="language-lua highlighter-rouge"><pre class="highlight"><code><span class="n">target</span><span class="p">(</span><span class="s2">"console"</span><span class="p">)</span>
<span class="n">set_kind</span><span class="p">(</span><span class="s2">"binary"</span><span class="p">)</span>
diff --git a/docs/landing/index.cn.md b/docs/landing/index.cn.md
index 7899399d9..b53a46d31 100755
--- a/docs/landing/index.cn.md
+++ b/docs/landing/index.cn.md
@@ -3,6 +3,12 @@ layout: default.cn
title: {{ site.name }}
---
+## 安装
+
+```bash
+$ bash <(curl -fsSL https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
+```
+
## 简单的工程描述
```lua
diff --git a/docs/landing/index.md b/docs/landing/index.md
index 3192712ca..b2b49aa50 100755
--- a/docs/landing/index.md
+++ b/docs/landing/index.md
@@ -3,6 +3,12 @@ layout: default
title: {{ site.name }}
---
+## Installation
+
+```bash
+$ bash <(curl -fsSL https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
+```
+
## Simple description
```lua
diff --git a/docs/zh/README.md b/docs/zh/README.md
index ca9d56fc6..7fec9e79e 100755
--- a/docs/zh/README.md
+++ b/docs/zh/README.md
@@ -52,7 +52,7 @@ $ brew install xmake
$ brew install xmake --HEAD
# 或者直接调用shell下载安装
-$ bash <(curl -s https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
+$ bash <(curl -fsSL https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
```
#### Linux
@@ -109,7 +109,7 @@ $ sudo apt-get install xmake
$ brew install xmake --HEAD
# 或者直接调用shell下载安装
-$ bash <(curl -s https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
+$ bash <(curl -fsSL https://raw.githubusercontent.com/tboox/xmake/master/scripts/get.sh)
```
#### 编译安装
diff --git a/scripts/get.ps1 b/scripts/get.ps1
index 59be2c9db..120605ce5 100644
--- a/scripts/get.ps1
+++ b/scripts/get.ps1
@@ -20,15 +20,13 @@ Function writeLogoLine($msg){
Write-Host $msg -BackgroundColor White -ForegroundColor DarkBlue
}
-writeLogoLine ' _ '
-writeLogoLine ' | | _ '
-writeLogoLine '__ ___ ______| |/ /___ '
-writeLogoLine '\ \/ | \ / / _ | / / __ \ '
-writeLogoLine ' \ /| \/ / / | | | __/ '
-writeLogoLine ' / \| \__/\ \_| \ \ \ \__. '
-writeLogoLine '/_/\_|_| |_\___\_\|\_\__/ getter'
-writeLogoLine ' '
-writeLogoLine ''
+writeLogoLine ' _ '
+writeLogoLine ' __ ___ __ __ __ _| | ______ '
+writeLogoLine ' \ \/ / | \/ |/ _ | |/ / __ \ '
+writeLogoLine ' > < | \__/ | /_| | < ___/ '
+writeLogoLine ' /_/\_\_|_| |_|\__ \|_|\_\____| getter '
+writeLogoLine ' '
+writeLogoLine ' '
if($PSVersionTable.PSVersion.Major -lt 5){
writeErrorTip 'Sorry but PowerShell v5+ is required'
diff --git a/scripts/get.sh b/scripts/get.sh
index 11a72d854..52a990dc7 100755
--- a/scripts/get.sh
+++ b/scripts/get.sh
@@ -4,16 +4,12 @@
# usage: bash <(curl -s <my location>) [branch]
# print a LOGO!
-echo -ne '\x1b[07m'
-echo ' _ '
-echo ' | | _ '
-echo '__ ___ ______| |/ /___ '
-echo '\ \/ | \ / / _ | / / __ \ '
-echo ' \ /| \/ / / | | | __/ '
-echo ' / \| \__/\ \_| \ \ \ \__. '
-echo '/_/\_|_| |_\___\_\|\_\__/ getter'
-echo ' '
-echo -e '\x1b[0m'
+echo ' _ '
+echo ' __ ___ __ __ __ _| | ______ '
+echo ' \ \/ / | \/ |/ _ | |/ / __ \ '
+echo ' > < | \__/ | /_| | < ___/ '
+echo ' /_/\_\_|_| |_|\__ \|_|\_\____| getter '
+echo ' '
brew --version >/dev/null 2>&1 && brew install --HEAD xmake && xmake --version && exit
if [ 0 -ne $(id -u) ]