Merge remote-tracking branch 'origin/dev' into dev

4 files changed, 37 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index fcd6c5d..95daccb 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ tig:
 wiki:
         # vimwiki
         if [ ! -d "$(HOME)/.vimwiki" ]; then \
-        git clone --depth=1 git@github.com:typebrook/wiki.git ~/vimwiki; \
+        git clone --depth=1 git@github.com:typebrook/wiki.git ~/vimwiki
         fi
 
 crontab:
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c77e1c3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+## Getting Started
+**via curl**
+```
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/typebrook/settings/dev/tools/install.sh)"
+```
+**via wget**
+```
+sh -c "$(wget -O- https://raw.githubusercontent.com/typebrook/settings/dev/tools/install.sh)"
+```
diff --git a/alias b/alias
index 053628e..f22f1c2 100644
--- a/alias
+++ b/alias
@@ -270,6 +270,7 @@ alias and='cd ~/git/geoBingAn.Android'
 alias cdT='cd ~/git/taiwan-topo'
 alias cdand='cd ~/git/sample'
 alias cdm='cd ~/git/tilemaker'
+alias stew='cd ~/git/mapstew'
 
 TAIWAN_BBOX='118.1036,20.72799,122.9312,26.60305'
 TAIWAN_BBOX_V='20.72799,118.1036,26.60305,122.9312'
diff --git a/tools/install.sh b/tools/install.sh
new file mode 100644
index 0000000..0eb2c5e
--- /dev/null
+++ b/tools/install.sh
@@ -0,0 +1,26 @@
+#! /usr/bin/env bash
+
+set -e
+
+# Default settings
+SETTING_DIR=${SETTING_DIR:-~/settings}
+REPO=${REPO:-typebrook/settings}
+REMOTE=${REMOTE:-https://github.com/${REPO}.git}
+BRANCH=${BRANCH:-dev}
+RCFILE=${RCFILE:-~/.$(basename $SHELL)rc}
+
+if [ ! -d $SETTING_DIR ]; then
+  git clone --depth=1 --branch "$BRANCH" "$REMOTE" "$SETTING_DIR" || {
+      error "git clone of settings repo failed"
+      exit 1
+  }
+fi
+
+sed -i "/^$/ N; \^# $REPO^, /^$/ d" $RCFILE
+echo "
+# $REPO
+export SETTING_DIR=$SETTING_DIR
+source \$SETTING_DIR/tools/load-settings.sh
+" >> $RCFILE
+
+cd "$SETTING_DIR" && make