Merge remote-tracking branch 'origin/dev' into dev

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'
 alias pqe='pacman -Qqe'
 alias pR='sudo pacman -R'
 psi() {
-  pqe | grep $1 >/dev/null && echo -e "$(tput setaf 13)[Installed]$(tput sgr0)"
+  [[ $(pacman -Qqe $1) != '' ]] 2>/dev/null && echo -e "$(tput setaf 13)[Installed]$(tput sgr0)"
   pacman -Si $1
 }
 
@@ -243,6 +243,8 @@ 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.screenshot='DIR=/sdcard/Pictures/Screenshots/; adb pull $DIR/`adb shell ls -t $DIR | head -1` .'
 alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .'
+alias adb.camera='DIR=/sdcard/DCIM/Camera; adb pull $DIR/`adb shell ls -t $DIR | head -1` .'
+alias adb.input='adb shell input text'
 adb.push() { 
   adb push $1 /sdcard/Download 
 }
@@ -306,15 +308,17 @@ alias xo='xsel -ob'
 alias xl='history | tail -1 | grep -oP "^\s*[0-9]+\s\s\K.*" | xsel -ib && echo Copied to clipboard && xsel -ob'
 
 # image
-image_vertical() { 
+image.vertical() { 
   suffix=${1##*.}
   convert "$@" -append $(basename -s .$suffix $1)-$(basename -s .$suffix ${@: -1}).${format:-$suffix}
 }
-image_horizontal() { 
+image.horizontal() { 
   convert "$@" +append output.png 
 }
-image_from_data_url() {
+image.from_data_url() {
+  [[ $1 == '' ]] && echo File name needed && return 1
   xsel -ob | sed -E 's/^.+,//' | base64 -d >$1
+  identify $1
 }
 
 # 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
 # see reflog, reset refernece
 bind generic gl ?git checkout HEAD@{"%(prompt Enter HEAD@{} number: )"}
 bind generic gL ?git reset --hard HEAD@{"%(prompt Enter HEAD@{} number: )"}
+bind reflog  c  ?git checkout %(commit)
 
 # highlight diff without +/-
 # 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 @@
 #! /bin/sh
 
-#export OSM_SERVER=https://master.apis.dev.openstreetmap.org
+export OSM_TEST_SERVER=https://master.apis.dev.openstreetmap.org
 export OSM_SERVER=https://api.openstreetmap.org
+export OSM_TES_SERVER=https://api.openstreetmap.org
 
 export OSM_API=$OSM_SERVER/api/0.6
 export OSM_USER_PASSWD=$(cat $SETTING_DIR/tokens/osm 2>/dev/null)