diff options
author | typebrook <typebrook@gmail.com> | 2020-02-27 16:32:37 +0800 |
---|---|---|
committer | typebrook <typebrook@gmail.com> | 2020-02-27 16:32:37 +0800 |
commit | 00b136155183ae522ca458e540a8cf29bf525e74 (patch) | |
tree | c6e9d20d5021c95afc7149456d57eb435d808150 | |
parent | 3fa79eb14a4c0244fb2dc4a5b805b7cffaa63770 (diff) |
update
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | alias | 4 | ||||
-rw-r--r-- | misc/cron | 2 | ||||
-rw-r--r-- | tigrc | 2 | ||||
-rwxr-xr-x | tools/check_upstream (renamed from scripts/check_upstream) | 0 | ||||
-rwxr-xr-x | tools/csv.move_column (renamed from scripts/csv.move_column) | 0 | ||||
-rwxr-xr-x | tools/csv.reorder (renamed from scripts/csv.reorder) | 0 | ||||
-rwxr-xr-x | tools/csv2geojson (renamed from scripts/csv2geojson) | 0 | ||||
-rw-r--r-- | tools/gpx/footer (renamed from scripts/gpx/footer) | 0 | ||||
-rwxr-xr-x | tools/gpx/gpx.check.py (renamed from scripts/gpx/gpx.check.py) | 0 | ||||
-rwxr-xr-x | tools/gpx/gpx.merge_gpx.sh (renamed from scripts/gpx/gpx.merge_gpx.sh) | 0 | ||||
-rwxr-xr-x | tools/gpx/gpx.merge_trk.sh (renamed from scripts/gpx/gpx.merge_trk.sh) | 0 | ||||
-rw-r--r-- | tools/gpx/header (renamed from scripts/gpx/header) | 0 | ||||
-rwxr-xr-x | tools/load-settings.sh (renamed from scripts/load-settings.sh) | 8 | ||||
-rwxr-xr-x | tools/match-road.sh (renamed from scripts/match-road.sh) | 0 | ||||
-rw-r--r-- | tools/mvt_decode.py (renamed from scripts/mvt_decode.py) | 0 | ||||
-rwxr-xr-x | tools/osm/josm_install.sh (renamed from scripts/osm/josm_install.sh) | 0 | ||||
-rw-r--r-- | tools/osm/osm (renamed from scripts/osm/osm) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.changeset.add (renamed from scripts/osm/osm.api.changeset.add) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.changeset.close (renamed from scripts/osm/osm.api.changeset.close) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.changeset.create (renamed from scripts/osm/osm.api.changeset.create) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.changeset.update (renamed from scripts/osm/osm.api.changeset.update) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.changeset.upload (renamed from scripts/osm/osm.api.changeset.upload) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.fetch (renamed from scripts/osm/osm.api.fetch) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.fetch.full (renamed from scripts/osm/osm.api.fetch.full) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.fetch.history (renamed from scripts/osm/osm.api.fetch.history) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.member.relation (renamed from scripts/osm/osm.api.member.relation) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.referenced.relation (renamed from scripts/osm/osm.api.referenced.relation) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.referenced.way (renamed from scripts/osm/osm.api.referenced.way) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.api.upload.to (renamed from scripts/osm/osm.api.upload.to) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.file.get (renamed from scripts/osm/osm.file.get) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.file.get.full (renamed from scripts/osm/osm.file.get.full) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.file.query (renamed from scripts/osm/osm.file.query) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.goto (renamed from scripts/osm/osm.goto) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.help (renamed from scripts/osm/osm.help) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.list.ids (renamed from scripts/osm/osm.list.ids) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.list.tag (renamed from scripts/osm/osm.list.tag) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.list.tags (renamed from scripts/osm/osm.list.tags) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.member.relation (renamed from scripts/osm/osm.member.relation) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.osc.by_member (renamed from scripts/osm/osm.osc.by_member) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.osc.by_tag (renamed from scripts/osm/osm.osc.by_tag) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.osm.remove (renamed from scripts/osm/osm.osm.remove) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.pbf.update (renamed from scripts/osm/osm.pbf.update) | 0 | ||||
-rwxr-xr-x | tools/osm/osm.query (renamed from scripts/osm/osm.query) | 0 | ||||
-rwxr-xr-x | tools/osm/sequence_number.sh (renamed from scripts/osm/sequence_number.sh) | 0 | ||||
-rwxr-xr-x | tools/refresh-todo.sh (renamed from scripts/refresh-todo.sh) | 0 | ||||
-rwxr-xr-x | tools/sync.sh (renamed from scripts/sync.sh) | 0 | ||||
-rwxr-xr-x | tools/upload-github-release-asset.sh (renamed from scripts/upload-github-release-asset.sh) | 0 | ||||
-rwxr-xr-x | tools/yaoren.sh (renamed from scripts/yaoren.sh) | 0 |
49 files changed, 9 insertions, 9 deletions
@@ -30,4 +30,4 @@ wiki: | |||
30 | fi | 30 | fi |
31 | 31 | ||
32 | crontab: | 32 | crontab: |
33 | (crontab -l 2>/dev/null; cat scripts/*.cron) | crontab - | 33 | (crontab -l 2>/dev/null; cat tools/*.cron) | crontab - |
@@ -115,7 +115,7 @@ upload_tig() { | |||
115 | 115 | ||
116 | # about custom settings | 116 | # about custom settings |
117 | alias cds="cd $SETTING_DIR" | 117 | alias cds="cd $SETTING_DIR" |
118 | alias cdss="cd $SETTING_DIR/scripts" | 118 | alias cdss="cd $SETTING_DIR/tools" |
119 | alias chs="cd $SETTING_DIR && tig status" | 119 | alias chs="cd $SETTING_DIR && tig status" |
120 | 120 | ||
121 | # about vimwiki | 121 | # about vimwiki |
@@ -253,7 +253,7 @@ alias mm='mkvmerge -o out.webm -w 01.webm + 02.webm' | |||
253 | alias du='ncdu' | 253 | alias du='ncdu' |
254 | alias we='weechat' | 254 | alias we='weechat' |
255 | mvt_decode() { | 255 | mvt_decode() { |
256 | python3 $SETTING_DIR/scripts/mvt_decode.py $1 | tr \' \" | sed 's/True/true/g' | jq . | 256 | python3 $SETTING_DIR/tools/mvt_decode.py $1 | tr \' \" | sed 's/True/true/g' | jq . |
257 | } | 257 | } |
258 | big52utf8() { | 258 | big52utf8() { |
259 | iconv -f BIG-5 -t UTF-8 | 259 | iconv -f BIG-5 -t UTF-8 |
@@ -1,2 +1,2 @@ | |||
1 | # update Taiwan OSM replication | 1 | # update Taiwan OSM replication |
2 | 0 7 * * * cd data && $HOME/settings/scripts/osm/osm.pbf.update taiwan-latest.osm.pbf >> log | 2 | 0 7 * * * cd data && $HOME/settings/tools/osm/osm.pbf.update taiwan-latest.osm.pbf >> log |
@@ -192,7 +192,7 @@ bind main I >sh -c "hub issue | tig" | |||
192 | ## Statistics | 192 | ## Statistics |
193 | bind main gc >sh -c 'cloc --git %(commit) | tig' | 193 | bind main gc >sh -c 'cloc --git %(commit) | tig' |
194 | ## Script to bump Android version | 194 | ## Script to bump Android version |
195 | bind main <C-B> !sh -c 'scripts/bump_version.sh && scripts/whatsnew.sh' | 195 | bind main <C-B> !sh -c 'tools/bump_version.sh && tools/whatsnew.sh' |
196 | 196 | ||
197 | # note | 197 | # note |
198 | #bind generic gnn !git notes edit %(commit) | 198 | #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 | |||
6 | source $SETTING_DIR/alias | 6 | source $SETTING_DIR/alias |
7 | 7 | ||
8 | # Add custom scripts into PATH | 8 | # Add custom scripts into PATH |
9 | PATH=$PATH:$SETTING_DIR/scripts | 9 | PATH=$PATH:$SETTING_DIR/tools |
10 | find $SETTING_DIR/scripts -type d | sed 1d |\ | 10 | find $SETTING_DIR/tools -type d | sed 1d |\ |
11 | while read dir; do | 11 | while read dir; do |
12 | PATH=$PATH:$dir | 12 | PATH=$PATH:$dir |
13 | done | 13 | done |
14 | 14 | ||
15 | # sync with important git repos | 15 | # sync with important git repos |
16 | $SETTING_DIR/scripts/sync.sh | 16 | $SETTING_DIR/tools/sync.sh |
17 | 17 | ||
18 | # load custom functions | 18 | # load custom functions |
19 | OSM_UTIL_DIR=$SETTING_DIR/scripts/osm | 19 | OSM_UTIL_DIR=$SETTING_DIR/tools/osm |
20 | source $OSM_UTIL_DIR/osm | 20 | source $OSM_UTIL_DIR/osm |
21 | 21 | ||
22 | # go | 22 | # 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 | |||