From 9b048d334611d3d084e86a1cb28a336d1435a5ad Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 30 Dec 2019 10:36:56 +0800 Subject: update --- alias | 12 +++++++++++- scripts/upload-github-release-asset.sh | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/alias b/alias index 6057d19..8cf1f46 100644 --- a/alias +++ b/alias @@ -26,13 +26,19 @@ 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 rmrf='rm -rf' alias rr='move_to_tmp' move_to_tmp() { mv $@ /tmp } +prompt() { + TMPFILE=$(mktemp) echo $1 > $TMPFILE && \ + vim $TMPFILE && \ + sed -i '$ q; s/$/ \\/' $TMPFILE && \ + cat $TMPFILE && \ + source $TMPFILE +} # package alias ai='sudo apt install' # apt install @@ -99,6 +105,10 @@ gcg() { } alias gls='git log -S' alias cdgs='cd $(git submodule status | sed "s/^.//" | cut -d" " -f2)' # cd to first submodule +upload() { + 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' 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 -- cgit v1.2.3-70-g09d2 From dd5d376629f23f49aed4926f11386887bdcf2455 Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 30 Dec 2019 10:44:43 +0800 Subject: update --- alias | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alias b/alias index 8cf1f46..31da894 100644 --- a/alias +++ b/alias @@ -33,11 +33,11 @@ move_to_tmp() { mv $@ /tmp } prompt() { - TMPFILE=$(mktemp) echo $1 > $TMPFILE && \ + TMPFILE=$(mktemp); echo $1 > $TMPFILE && \ vim $TMPFILE && \ sed -i '$ q; s/$/ \\/' $TMPFILE && \ cat $TMPFILE && \ - source $TMPFILE + eval $(cat $TMPFILE) } # package @@ -105,7 +105,7 @@ gcg() { } alias gls='git log -S' alias cdgs='cd $(git submodule status | sed "s/^.//" | cut -d" " -f2)' # cd to first submodule -upload() { +gh-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" } -- cgit v1.2.3-70-g09d2 From 81fd0ef4ea0fdbf2ca35da303478de9b3e7b8082 Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 30 Dec 2019 10:52:44 +0800 Subject: update --- alias | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/alias b/alias index 31da894..5a481c3 100644 --- a/alias +++ b/alias @@ -36,8 +36,7 @@ prompt() { TMPFILE=$(mktemp); echo $1 > $TMPFILE && \ vim $TMPFILE && \ sed -i '$ q; s/$/ \\/' $TMPFILE && \ - cat $TMPFILE && \ - eval $(cat $TMPFILE) + eval $(cat $TMPFILE | tee /dev/tty) } # package @@ -259,7 +258,4 @@ alias cdT='cd ~/git/taiwan-topo' alias cdand='cd ~/git/sample' alias cdm='cd ~/git/sharkbig.github.io' -repo='git@github.com' -hub='https://github.com' -typebrook='git@github.com:typebrook' GITHUB_API='https://api.github.com' -- cgit v1.2.3-70-g09d2 From dd135ee1526d271ae022810ed6cc2a71938da04b Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 30 Dec 2019 11:06:28 +0800 Subject: update --- alias | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/alias b/alias index 5a481c3..e35d392 100644 --- a/alias +++ b/alias @@ -24,9 +24,7 @@ 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 hg='history|grep' +alias hg='history | grep' alias rmrf='rm -rf' alias rr='move_to_tmp' move_to_tmp() { @@ -42,6 +40,8 @@ prompt() { # 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 ..' @@ -76,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" && @@ -104,7 +104,7 @@ gcg() { } alias gls='git log -S' alias cdgs='cd $(git submodule status | sed "s/^.//" | cut -d" " -f2)' # cd to first submodule -gh-release-asset() { +gh_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" } @@ -131,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 \ @@ -147,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 } @@ -200,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' -- cgit v1.2.3-70-g09d2 From e5f8f7539abec843381ddd6639905ce73673c4b7 Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 30 Dec 2019 12:35:37 +0800 Subject: update --- alias | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alias b/alias index e35d392..c93f31d 100644 --- a/alias +++ b/alias @@ -31,7 +31,7 @@ move_to_tmp() { mv $@ /tmp } prompt() { - TMPFILE=$(mktemp); echo $1 > $TMPFILE && \ + TMPFILE=$(mktemp); echo -e $1 > $TMPFILE && \ vim $TMPFILE && \ sed -i '$ q; s/$/ \\/' $TMPFILE && \ eval $(cat $TMPFILE | tee /dev/tty) @@ -104,8 +104,8 @@ gcg() { } alias gls='git log -S' alias cdgs='cd $(git submodule status | sed "s/^.//" | cut -d" " -f2)' # cd to first submodule -gh_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" +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" } -- cgit v1.2.3-70-g09d2 From f791483cb24005b7d07f2ca9f2737490b3fdb2ab Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 30 Dec 2019 15:12:29 +0800 Subject: update --- alias | 1 - scripts/gist | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/alias b/alias index c93f31d..5a9fb00 100644 --- a/alias +++ b/alias @@ -250,7 +250,6 @@ 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' diff --git a/scripts/gist b/scripts/gist index 9dfa31d..834d6cf 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 |\ -- cgit v1.2.3-70-g09d2 From 07228d5f372d171618f28a64b446759e7eeadf4a Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 30 Dec 2019 16:18:34 +0800 Subject: update --- scripts/gist | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/gist b/scripts/gist index 834d6cf..b55012b 100755 --- a/scripts/gist +++ b/scripts/gist @@ -110,15 +110,19 @@ _show_detail() { # create a new gist with a file and description # TODO support folder of files _create_gist() { - FILE=$(basename $1) - - jq --arg FILE "$FILE" --arg DESC "$2" '. as $content | { - public: true, - files: { - ($FILE): {content: $content} - }, + echo -n 'description: ' + read DESC + + 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 } @@ -137,7 +141,8 @@ case "$1" in cat $index ;; create | c) - _create_gist "$2" "$3" + shift; + _create_gist $@ ;; edit | e) _edit_gist "$2" "$3" -- cgit v1.2.3-70-g09d2