aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--alias12
-rw-r--r--tigrc1
-rw-r--r--tools/osm/osm3
3 files changed, 11 insertions, 5 deletions
diff --git a/alias b/alias
index 919e6c5..9414752 100644
--- a/alias
+++ b/alias
@@ -113,7 +113,7 @@ alias pfl='pacman -Fl'
113alias pqe='pacman -Qqe' 113alias pqe='pacman -Qqe'
114alias pR='sudo pacman -R' 114alias pR='sudo pacman -R'
115psi() { 115psi() {
116 pqe | grep $1 >/dev/null && echo -e "$(tput setaf 13)[Installed]$(tput sgr0)" 116 [[ $(pacman -Qqe $1) != '' ]] 2>/dev/null && echo -e "$(tput setaf 13)[Installed]$(tput sgr0)"
117 pacman -Si $1 117 pacman -Si $1
118} 118}
119 119
@@ -243,6 +243,8 @@ alias adb.list='adb shell dumpsys package d'
243alias rmcache='rm -rf ~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/*' 243alias rmcache='rm -rf ~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/*'
244alias adb.screenshot='DIR=/sdcard/Pictures/Screenshots/; adb pull $DIR/`adb shell ls -t $DIR | head -1` .' 244alias adb.screenshot='DIR=/sdcard/Pictures/Screenshots/; adb pull $DIR/`adb shell ls -t $DIR | head -1` .'
245alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .' 245alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .'
246alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .'
247alias adb.input='adb shell input text'
246adb.push() { 248adb.push() {
247 adb push $1 /sdcard/Download 249 adb push $1 /sdcard/Download
248} 250}
@@ -306,15 +308,17 @@ alias xo='xsel -ob'
306alias xl='history | tail -1 | grep -oP "^\s*[0-9]+\s\s\K.*" | xsel -ib && echo Copied to clipboard && xsel -ob' 308alias xl='history | tail -1 | grep -oP "^\s*[0-9]+\s\s\K.*" | xsel -ib && echo Copied to clipboard && xsel -ob'
307 309
308# image 310# image
309image_vertical() { 311image.vertical() {
310 suffix=${1##*.} 312 suffix=${1##*.}
311 convert "$@" -append $(basename -s .$suffix $1)-$(basename -s .$suffix ${@: -1}).${format:-$suffix} 313 convert "$@" -append $(basename -s .$suffix $1)-$(basename -s .$suffix ${@: -1}).${format:-$suffix}
312} 314}
313image_horizontal() { 315image.horizontal() {
314 convert "$@" +append output.png 316 convert "$@" +append output.png
315} 317}
316image_from_data_url() { 318image.from_data_url() {
319 [[ $1 == '' ]] && echo File name needed && return 1
317 xsel -ob | sed -E 's/^.+,//' | base64 -d >$1 320 xsel -ob | sed -E 's/^.+,//' | base64 -d >$1
321 identify $1
318} 322}
319 323
320# thunderbird 324# thunderbird
diff --git a/tigrc b/tigrc
index 43893c0..fd0ebd3 100644
--- a/tigrc
+++ b/tigrc
@@ -57,6 +57,7 @@ bind generic w :toggle ignore-case
57# see reflog, reset refernece 57# see reflog, reset refernece
58bind generic gl ?git checkout HEAD@{"%(prompt Enter HEAD@{} number: )"} 58bind generic gl ?git checkout HEAD@{"%(prompt Enter HEAD@{} number: )"}
59bind generic gL ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"} 59bind generic gL ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"}
60bind reflog c ?git checkout %(commit)
60 61
61# highlight diff without +/- 62# highlight diff without +/-
62# set diff-show-signs = false 63# set diff-show-signs = false
diff --git a/tools/osm/osm b/tools/osm/osm
index a595fb7..344f906 100644
--- a/tools/osm/osm
+++ b/tools/osm/osm
@@ -1,7 +1,8 @@
1#! /bin/sh 1#! /bin/sh
2 2
3#export OSM_SERVER=https://master.apis.dev.openstreetmap.org 3export OSM_TEST_SERVER=https://master.apis.dev.openstreetmap.org
4export OSM_SERVER=https://api.openstreetmap.org 4export OSM_SERVER=https://api.openstreetmap.org
5export OSM_TES_SERVER=https://api.openstreetmap.org
5 6
6export OSM_API=$OSM_SERVER/api/0.6 7export OSM_API=$OSM_SERVER/api/0.6
7export OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm 2>/dev/null) 8export OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm 2>/dev/null)