summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortypebrook <typebrook@gmail.com>2019-11-09 17:12:16 +0800
committertypebrook <typebrook@gmail.com>2019-11-09 17:12:16 +0800
commitadc1c4462ad1c1d62dfc3e7caf95474da8724467 (patch)
treeac73e75f8a18f51292e3ec052348c81def4173d2
parente78266803bc1fa8d6e98e33bc82e8f4eb255160a (diff)
update
-rw-r--r--alias.sh (renamed from alias)16
-rwxr-xr-xscripts/my-settings.sh5
2 files changed, 12 insertions, 9 deletions
diff --git a/alias b/alias.sh
index 10069b2..2cd5285 100644
--- a/alias
+++ b/alias.sh
@@ -1,12 +1,10 @@
1SETTING_DIR="$HOME/git/settings"
2
3# settings 1# settings
4alias al='vim ~/.bash_aliases && source ~/.bash_aliases' 2alias al="vim $SETTING_DIR/$0 && source ~/$0"
5alias all='source ~/.bash_aliases' 3alias all="source ~/$0"
6alias bashrc='vim ~/.bashrc && source ~/.bashrc' 4alias bashrc='vim ~/.bashrc && source ~/.bashrc'
7alias zshrc='vim ~/.zshrc && source ~/.zshrc' 5alias zshrc='vim ~/.zshrc && source ~/.zshrc'
8alias vimrc='vim ~/.vimrc' 6alias vimrc='vim ~/.vimrc'
9alias tigrc='vim $SETTING_DIR/tigrc' 7alias tigrc="vim $SETTING_DIR/tigrc"
10alias gitconfig='vim ~/.gitconfig' 8alias gitconfig='vim ~/.gitconfig'
11alias log='cat log | grep "`date +"%b %d"`"' 9alias log='cat log | grep "`date +"%b %d"`"'
12 10
@@ -102,7 +100,7 @@ alias t='tig'
102alias ts='tig status' 100alias ts='tig status'
103alias ta='tig --all' 101alias ta='tig --all'
104alias get-tig='curl -LO https://github.com/typebrook/tig/releases/download/tig-2.4.1/tig' 102alias get-tig='curl -LO https://github.com/typebrook/tig/releases/download/tig-2.4.1/tig'
105alias upload-tig='$SETTING_DIR/scripts/upload-github-release-asset.sh github_api_token=$(head -1 $SETTING_DIR/tokens/github-release) owner=typebrook repo=tig tag=tig-2.4.1 filename=$(which tig)' 103alias upload-tig="$SETTING_DIR/scripts/upload-github-release-asset.sh github_api_token=$(head -1 $SETTING_DIR/tokens/github-release) owner=typebrook repo=tig tag=tig-2.4.1 filename=$(which tig)"
106 104
107# Android 105# Android
108alias debug='./gradlew app:installDebug && adb shell am start -n com.geothings.geobingan/.MainActivity_' 106alias debug='./gradlew app:installDebug && adb shell am start -n com.geothings.geobingan/.MainActivity_'
@@ -118,10 +116,10 @@ alias gl='nl $gist_list'
118alias gll='gist -l > $gist_list && nl $gist_list' 116alias gll='gist -l > $gist_list && nl $gist_list'
119alias gi='_gistRead' 117alias gi='_gistRead'
120alias gd='_gistDelete' 118alias gd='_gistDelete'
121_gistRead() { 119_gistRead() {
122 gist -r $(awk '{print $1}' $gist_list | awk -v row="$1" -F '/' 'FNR==row {print $NF}') $2 120 gist -r $(awk '{print $1}' $gist_list | awk -v row="$1" -F '/' 'FNR==row {print $NF}') $2
123} 121}
124_gistDelete() { 122_gistDelete() {
125 deleted=~/gist/deleted/$(date +"%s") 123 deleted=~/gist/deleted/$(date +"%s")
126 _gistRead $1 > $deleted && echo "backup at $deleted" 124 _gistRead $1 > $deleted && echo "backup at $deleted"
127 gist --delete $(awk '{print $1}' $gist_list | awk -v row="$1" -F '/' 'FNR==row {print $NF}') && \ 125 gist --delete $(awk '{print $1}' $gist_list | awk -v row="$1" -F '/' 'FNR==row {print $NF}') && \
@@ -193,7 +191,7 @@ alias we='weechat'
193mvt_decode() { 191mvt_decode() {
194 python3 $SETTING_DIR/scripts/mvt_decode.py $1 | tr \' \" | sed 's/True/true/g' | jq . 192 python3 $SETTING_DIR/scripts/mvt_decode.py $1 | tr \' \" | sed 's/True/true/g' | jq .
195} 193}
196big52utf8() { 194big52utf8() {
197 iconv -f BIG-5 -t UTF-8 $1 > $1.utf8 195 iconv -f BIG-5 -t UTF-8 $1 > $1.utf8
198} 196}
199 197
diff --git a/scripts/my-settings.sh b/scripts/my-settings.sh
new file mode 100755
index 0000000..92a22ce
--- /dev/null
+++ b/scripts/my-settings.sh
@@ -0,0 +1,5 @@
1if [[ -z "$SETTING_DIR" ]]; then
2 SETTING_DIR="$HOME/settings"
3fi
4
5source $SETTING_DIR/alias.sh