Merge commit '07228d5f372d171618f28a64b446759e7eeadf4a' into dev

3 files changed, 38 insertions, 28 deletions

diff --git a/alias b/alias
index a930287..6b5042a 100644
--- a/alias
+++ b/alias
@@ -24,19 +24,24 @@ vs() {
 # shell
 alias src="source $HOME/.$(basename $SHELL)rc"
 alias ll='ls -alh'
-alias si='sudo snap install' # snap install
-alias ni='sudo npm install -g' # nodejs install
-alias ss='sudo !!'
-alias hg='history|grep'
+alias hg='history | grep'
 alias rmrf='rm -rf'
 alias rr='move_to_tmp'
 move_to_tmp() { 
     mv $@ /tmp 
 }
+prompt() {
+    TMPFILE=$(mktemp); echo -e $1 > $TMPFILE && \
+    vim $TMPFILE && \
+    sed -i '$ q; s/$/ \\/' $TMPFILE && \
+    eval $(cat $TMPFILE | tee /dev/tty)
+}
 
 # package
 alias ai='sudo apt install' # apt install
 alias aptu='sudo apt update && sudo apt upgrade'
+alias si='sudo snap install' # snap install
+alias ni='sudo npm install -g' # nodejs install
 
 # cd to DIRs
 alias ..='cd ..'
@@ -71,9 +76,9 @@ wi() {
 alias ce='crontab -e'
 
 # ranger
-alias r='_ranger-cd'
+alias r='_ranger_cd'
 alias ranrc='vim ~/.config/ranger/rc.conf'
-_ranger-cd() {
+_ranger_cd() {
     tempfile="$(mktemp -t tmp.XXXXXX)"
     ranger --choosedir="$tempfile" "${@:-$(pwd)}"
     test -f "$tempfile" &&
@@ -99,6 +104,10 @@ gcg() {
 }
 alias gls='git log -S'
 alias cdgs='cd $(git submodule status | sed "s/^.//" | cut -d" "  -f2)' # cd to first submodule
+github_release_asset() {
+    command="upload-github-release-asset.sh\n github_api_token=$(cat ~/settings/tokens/github)\n owner=typebrook\n repo=tig\n tag=LATEST\n filename=$(which tig)\n overwrite=false"
+    prompt "$command"
+}
 
 # docker
 alias dp='docker ps'
@@ -122,7 +131,7 @@ alias t='tig'
 alias ts='tig status'
 alias ta='tig --all'
 alias get-tig='curl -LO https://github.com/typebrook/tig/releases/download/tig-2.5.0/tig'
-upload-tig() {
+upload_tig() {
     upload-github-release-asset.sh \
         github_api_token=$(cat ~/settings/tokens/github) \
         owner=typebrook \
@@ -138,7 +147,7 @@ alias adb-default='adb shell dumpsys package domain-preferred-apps'
 alias adb-list='adb shell dumpsys package d'
 alias rmcache='rm -rf ~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/*'
 alias adb-last-screenshot='adb pull /sdcard/Screenshots/`adb shell ls -t /sdcard/Screenshots/ | head -1` ~/Desktop'
-adb-push() { 
+adb_push() { 
     adb push $1 /sdcard/Download 
 }
 
@@ -191,10 +200,7 @@ alias data-osm-diff="curl https://planet.openstreetmap.org/replication/minute/st
 alias data-taiwan-town='curl -o town.zip -L http://data.moi.gov.tw/MoiOD/System/DownloadFile.aspx\?DATA\=CD02C824-45C5-48C8-B631-98B205A2E35A'
 alias data-taiwan-village='curl -o village.zip -L http://data.moi.gov.tw/MoiOD/System/DownloadFile.aspx\?DATA\=B8AF344F-B5C6-4642-AF46-1832054399CE'
 alias data-taiwan-poly='curl -O http://download.geofabrik.de/asia/taiwan.poly'
-data-taiwan-county-code() {
-    curl --silent https://www.ris.gov.tw/documents/data/5/1/RSCD0101.txt |\
-    iconv -f BIG-5 -t UTF-8 -
-}
+alias data-taiwan-county-code='curl --silent https://www.ris.gov.tw/documents/data/5/1/RSCD0101.txt | iconv -f BIG-5 -t UTF-8 -'
 
 # clipboard
 alias xi='xsel -ib'
@@ -244,13 +250,9 @@ alias cdo='cd ~/git/openmaptiles'
 alias cdS='cd ~/git/StreetComplete'
 alias cdW='cd ~/git/geoBingAnWeb'
 alias and='cd ~/git/geoBingAn.Android'
-alias cdG='cd ~/git/git'
 alias cdT='cd ~/git/taiwan-topo'
 alias cdand='cd ~/git/sample'
 alias cdm='cd ~/git/sharkbig.github.io/rescue'
 alias cdmw='cd ~/git/sharkbig.github.io/.github/workflows'
 
-repo='git@github.com'
-hub='https://github.com'
-typebrook='git@github.com:typebrook'
 GITHUB_API='https://api.github.com'
diff --git a/scripts/gist b/scripts/gist
index 9dfa31d..b55012b 100755
--- a/scripts/gist
+++ b/scripts/gist
@@ -49,6 +49,9 @@ auth_header="Authorization: token $github_api_token"
 mkdir -p $folder
 index=$folder/index
 
+# Validate settings.
+[ "$TRACE" ] && set -x && echo foo
+
 # get the list of gists
 _update() {
     curl -s -H "$auth_header" $github_api/users/$user/gists |\
@@ -107,15 +110,19 @@ _show_detail() {
 # create a new gist with a file and description
 # TODO support folder of files
 _create_gist() {
-    FILE=$(basename $1)
+    echo -n 'description: '
+    read DESC
 
-    jq --arg FILE "$FILE" --arg DESC "$2" '. as $content | {
-        public: true, 
-        files: {
-            ($FILE): {content: $content}
-        },
+    echo $@ | tr " " "\n" |\
+    while read file; do
+        FILE=$(basename $file)
+        jq --arg FILE "$FILE" '. as $content | { ($FILE): {content: $content} }' -Rs $file
+    done |\
+    jq -s --arg DESC "$DESC" '{
+        public: true,
+        files: add,
         description: ($DESC)
-    }' -R -s $1 |\
+    }' |\
     curl -s -H "$auth_header" --data @- $github_api/gists > /dev/null && \
     _update
 }
@@ -134,7 +141,8 @@ case "$1" in
     cat $index
     ;;
   create | c)
-    _create_gist "$2" "$3"
+    shift;
+    _create_gist $@
     ;;
   edit | e)
     _edit_gist "$2" "$3"
diff --git a/scripts/upload-github-release-asset.sh b/scripts/upload-github-release-asset.sh
index 6923870..0325530 100755
--- a/scripts/upload-github-release-asset.sh
+++ b/scripts/upload-github-release-asset.sh
@@ -62,17 +62,17 @@ eval $(echo "$response" | grep -C2 "\"name\":.\+$(basename $filename)" | grep -m
 if [ "$asset_id" = ""  ]; then
     echo "No need to overwrite asset"
 else
-    if [ "$overwrite" ]; then
+    if [[ "$overwrite" == "true" ]] || [[ "$overwrite" == "delete" ]]; then
         echo "Deleting asset($asset_id)... "
         curl  -X "DELETE" -H "Authorization: token $github_api_token" "https://api.github.com/repos/$owner/$repo/releases/assets/$asset_id"
+        if [[ "$overwrite" == "delete" ]]; then
+            exit 0
+        fi
     else
         echo "File already exists on tag $tag"
         echo "If you want to overwrite it, set overwrite=true"
         exit 1
     fi
-    if [ "$overwrite" == "delete" ]; then
-        exit 0
-    fi
 fi
 
 # Upload asset