Merge branch 'dev' of github.com:typebrook/settings into dev

49 files changed, 9 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 77e60d9..fcd6c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -30,4 +30,4 @@ wiki:
         fi
 
 crontab:
-        (crontab -l 2>/dev/null; cat scripts/*.cron) | crontab -
+        (crontab -l 2>/dev/null; cat tools/*.cron) | crontab -
diff --git a/alias b/alias
index d146dae..d32f1b4 100644
--- a/alias
+++ b/alias
@@ -115,7 +115,7 @@ upload_tig() {
 
 # about custom settings
 alias cds="cd $SETTING_DIR"
-alias cdss="cd $SETTING_DIR/scripts"
+alias cdss="cd $SETTING_DIR/tools"
 alias chs="cd $SETTING_DIR && tig status"
 
 # about vimwiki
@@ -253,7 +253,7 @@ alias mm='mkvmerge -o out.webm -w 01.webm + 02.webm'
 alias du='ncdu'
 alias we='weechat'
 mvt_decode() {
-  python3 $SETTING_DIR/scripts/mvt_decode.py $1 | tr \' \" | sed 's/True/true/g' | jq .
+  python3 $SETTING_DIR/tools/mvt_decode.py $1 | tr \' \" | sed 's/True/true/g' | jq .
 }
 big52utf8() { 
   iconv -f BIG-5 -t UTF-8 
diff --git a/misc/cron b/misc/cron
index aeb498a..64fe9a7 100644
--- a/misc/cron
+++ b/misc/cron
@@ -1,2 +1,2 @@
 # update Taiwan OSM replication
-0 7 * * * cd data && $HOME/settings/scripts/osm/osm.pbf.update taiwan-latest.osm.pbf >> log
+0 7 * * * cd data && $HOME/settings/tools/osm/osm.pbf.update taiwan-latest.osm.pbf >> log
diff --git a/tigrc b/tigrc
index 070fe9b..459fb03 100644
--- a/tigrc
+++ b/tigrc
@@ -192,7 +192,7 @@ bind main I >sh -c "hub issue | tig"
 ## Statistics
 bind main gc >sh -c 'cloc --git %(commit) | tig'
 ## Script to bump Android version
-bind main <C-B> !sh -c 'scripts/bump_version.sh && scripts/whatsnew.sh'
+bind main <C-B> !sh -c 'tools/bump_version.sh && tools/whatsnew.sh'
 
 # note
 #bind generic gnn !git notes edit %(commit)
diff --git a/scripts/check_upstream b/tools/check_upstream
index 3313e5b..3313e5b 100755
--- a/scripts/check_upstream
+++ b/tools/check_upstream
diff --git a/scripts/csv.move_column b/tools/csv.move_column
index a62701f..a62701f 100755
--- a/scripts/csv.move_column
+++ b/tools/csv.move_column
diff --git a/scripts/csv.reorder b/tools/csv.reorder
index 8a64239..8a64239 100755
--- a/scripts/csv.reorder
+++ b/tools/csv.reorder
diff --git a/scripts/csv2geojson b/tools/csv2geojson
index 028aed7..028aed7 100755
--- a/scripts/csv2geojson
+++ b/tools/csv2geojson
diff --git a/scripts/gpx/footer b/tools/gpx/footer
index d0759c0..d0759c0 100644
--- a/scripts/gpx/footer
+++ b/tools/gpx/footer
diff --git a/scripts/gpx/gpx.check.py b/tools/gpx/gpx.check.py
index 10be97c..10be97c 100755
--- a/scripts/gpx/gpx.check.py
+++ b/tools/gpx/gpx.check.py
diff --git a/scripts/gpx/gpx.merge_gpx.sh b/tools/gpx/gpx.merge_gpx.sh
index 4b024a7..4b024a7 100755
--- a/scripts/gpx/gpx.merge_gpx.sh
+++ b/tools/gpx/gpx.merge_gpx.sh
diff --git a/scripts/gpx/gpx.merge_trk.sh b/tools/gpx/gpx.merge_trk.sh
index c3a72d4..c3a72d4 100755
--- a/scripts/gpx/gpx.merge_trk.sh
+++ b/tools/gpx/gpx.merge_trk.sh
diff --git a/scripts/gpx/header b/tools/gpx/header
index 1912e8b..1912e8b 100644
--- a/scripts/gpx/header
+++ b/tools/gpx/header
diff --git a/scripts/load-settings.sh b/tools/load-settings.sh
index 07c8791..30a29b0 100755
--- a/scripts/load-settings.sh
+++ b/tools/load-settings.sh
@@ -6,17 +6,17 @@ fi
 source $SETTING_DIR/alias
 
 # Add custom scripts into PATH
-PATH=$PATH:$SETTING_DIR/scripts
-find $SETTING_DIR/scripts -type d | sed 1d |\
+PATH=$PATH:$SETTING_DIR/tools
+find $SETTING_DIR/tools -type d | sed 1d |\
 while read dir; do
     PATH=$PATH:$dir
 done
 
 # sync with important git repos
-$SETTING_DIR/scripts/sync.sh
+$SETTING_DIR/tools/sync.sh
 
 # load custom functions
-OSM_UTIL_DIR=$SETTING_DIR/scripts/osm
+OSM_UTIL_DIR=$SETTING_DIR/tools/osm
 source $OSM_UTIL_DIR/osm
 
 # go
diff --git a/scripts/match-road.sh b/tools/match-road.sh
index d9beaae..d9beaae 100755
--- a/scripts/match-road.sh
+++ b/tools/match-road.sh
diff --git a/scripts/mvt_decode.py b/tools/mvt_decode.py
index 0f661dd..0f661dd 100644
--- a/scripts/mvt_decode.py
+++ b/tools/mvt_decode.py
diff --git a/scripts/osm/josm_install.sh b/tools/osm/josm_install.sh
index 520875a..520875a 100755
--- a/scripts/osm/josm_install.sh
+++ b/tools/osm/josm_install.sh
diff --git a/scripts/osm/osm b/tools/osm/osm
index a595fb7..a595fb7 100644
--- a/scripts/osm/osm
+++ b/tools/osm/osm
diff --git a/scripts/osm/osm.api.changeset.add b/tools/osm/osm.api.changeset.add
index 3e4878e..3e4878e 100755
--- a/scripts/osm/osm.api.changeset.add
+++ b/tools/osm/osm.api.changeset.add
diff --git a/scripts/osm/osm.api.changeset.close b/tools/osm/osm.api.changeset.close
index 3b016c3..3b016c3 100755
--- a/scripts/osm/osm.api.changeset.close
+++ b/tools/osm/osm.api.changeset.close
diff --git a/scripts/osm/osm.api.changeset.create b/tools/osm/osm.api.changeset.create
index ed2601a..ed2601a 100755
--- a/scripts/osm/osm.api.changeset.create
+++ b/tools/osm/osm.api.changeset.create
diff --git a/scripts/osm/osm.api.changeset.update b/tools/osm/osm.api.changeset.update
index 7b32741..7b32741 100755
--- a/scripts/osm/osm.api.changeset.update
+++ b/tools/osm/osm.api.changeset.update
diff --git a/scripts/osm/osm.api.changeset.upload b/tools/osm/osm.api.changeset.upload
index 96bdff4..96bdff4 100755
--- a/scripts/osm/osm.api.changeset.upload
+++ b/tools/osm/osm.api.changeset.upload
diff --git a/scripts/osm/osm.api.fetch b/tools/osm/osm.api.fetch
index 8460c5f..8460c5f 100755
--- a/scripts/osm/osm.api.fetch
+++ b/tools/osm/osm.api.fetch
diff --git a/scripts/osm/osm.api.fetch.full b/tools/osm/osm.api.fetch.full
index 5ee78b8..5ee78b8 100755
--- a/scripts/osm/osm.api.fetch.full
+++ b/tools/osm/osm.api.fetch.full
diff --git a/scripts/osm/osm.api.fetch.history b/tools/osm/osm.api.fetch.history
index bc837bd..bc837bd 100755
--- a/scripts/osm/osm.api.fetch.history
+++ b/tools/osm/osm.api.fetch.history
diff --git a/scripts/osm/osm.api.member.relation b/tools/osm/osm.api.member.relation
index 5addef7..5addef7 100755
--- a/scripts/osm/osm.api.member.relation
+++ b/tools/osm/osm.api.member.relation
diff --git a/scripts/osm/osm.api.referenced.relation b/tools/osm/osm.api.referenced.relation
index 2ce0631..2ce0631 100755
--- a/scripts/osm/osm.api.referenced.relation
+++ b/tools/osm/osm.api.referenced.relation
diff --git a/scripts/osm/osm.api.referenced.way b/tools/osm/osm.api.referenced.way
index 1d84238..1d84238 100755
--- a/scripts/osm/osm.api.referenced.way
+++ b/tools/osm/osm.api.referenced.way
diff --git a/scripts/osm/osm.api.upload.to b/tools/osm/osm.api.upload.to
index 3979220..3979220 100755
--- a/scripts/osm/osm.api.upload.to
+++ b/tools/osm/osm.api.upload.to
diff --git a/scripts/osm/osm.file.get b/tools/osm/osm.file.get
index e2b67b4..e2b67b4 100755
--- a/scripts/osm/osm.file.get
+++ b/tools/osm/osm.file.get
diff --git a/scripts/osm/osm.file.get.full b/tools/osm/osm.file.get.full
index 50ee2f1..50ee2f1 100755
--- a/scripts/osm/osm.file.get.full
+++ b/tools/osm/osm.file.get.full
diff --git a/scripts/osm/osm.file.query b/tools/osm/osm.file.query
index 4a01b5b..4a01b5b 100755
--- a/scripts/osm/osm.file.query
+++ b/tools/osm/osm.file.query
diff --git a/scripts/osm/osm.goto b/tools/osm/osm.goto
index 25bceaa..25bceaa 100755
--- a/scripts/osm/osm.goto
+++ b/tools/osm/osm.goto
diff --git a/scripts/osm/osm.help b/tools/osm/osm.help
index aa3b36b..aa3b36b 100755
--- a/scripts/osm/osm.help
+++ b/tools/osm/osm.help
diff --git a/scripts/osm/osm.list.ids b/tools/osm/osm.list.ids
index 8e5d870..8e5d870 100755
--- a/scripts/osm/osm.list.ids
+++ b/tools/osm/osm.list.ids
diff --git a/scripts/osm/osm.list.tag b/tools/osm/osm.list.tag
index 76649a0..76649a0 100755
--- a/scripts/osm/osm.list.tag
+++ b/tools/osm/osm.list.tag
diff --git a/scripts/osm/osm.list.tags b/tools/osm/osm.list.tags
index 767d32a..767d32a 100755
--- a/scripts/osm/osm.list.tags
+++ b/tools/osm/osm.list.tags
diff --git a/scripts/osm/osm.member.relation b/tools/osm/osm.member.relation
index f8d4598..f8d4598 100755
--- a/scripts/osm/osm.member.relation
+++ b/tools/osm/osm.member.relation
diff --git a/scripts/osm/osm.osc.by_member b/tools/osm/osm.osc.by_member
index 5f9d9be..5f9d9be 100755
--- a/scripts/osm/osm.osc.by_member
+++ b/tools/osm/osm.osc.by_member
diff --git a/scripts/osm/osm.osc.by_tag b/tools/osm/osm.osc.by_tag
index cc92c1d..cc92c1d 100755
--- a/scripts/osm/osm.osc.by_tag
+++ b/tools/osm/osm.osc.by_tag
diff --git a/scripts/osm/osm.osm.remove b/tools/osm/osm.osm.remove
index 83d6ea8..83d6ea8 100755
--- a/scripts/osm/osm.osm.remove
+++ b/tools/osm/osm.osm.remove
diff --git a/scripts/osm/osm.pbf.update b/tools/osm/osm.pbf.update
index cd115a7..cd115a7 100755
--- a/scripts/osm/osm.pbf.update
+++ b/tools/osm/osm.pbf.update
diff --git a/scripts/osm/osm.query b/tools/osm/osm.query
index 8d0b9f7..8d0b9f7 100755
--- a/scripts/osm/osm.query
+++ b/tools/osm/osm.query
diff --git a/scripts/osm/sequence_number.sh b/tools/osm/sequence_number.sh
index eb365d0..eb365d0 100755
--- a/scripts/osm/sequence_number.sh
+++ b/tools/osm/sequence_number.sh
diff --git a/scripts/refresh-todo.sh b/tools/refresh-todo.sh
index 7931536..7931536 100755
--- a/scripts/refresh-todo.sh
+++ b/tools/refresh-todo.sh
diff --git a/scripts/sync.sh b/tools/sync.sh
index 1c33138..1c33138 100755
--- a/scripts/sync.sh
+++ b/tools/sync.sh
diff --git a/scripts/upload-github-release-asset.sh b/tools/upload-github-release-asset.sh
index 0325530..0325530 100755
--- a/scripts/upload-github-release-asset.sh
+++ b/tools/upload-github-release-asset.sh
diff --git a/scripts/yaoren.sh b/tools/yaoren.sh
index 58d95df..58d95df 100755
--- a/scripts/yaoren.sh
+++ b/tools/yaoren.sh