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

2 files changed, 24 insertions, 1 deletions

diff --git a/alias b/alias
index 73b47ed..0f4127b 100644
--- a/alias
+++ b/alias
@@ -219,6 +219,8 @@ alias ptt='ssh bbsu@ptt.cc'
 alias topo='ssh topo.tw'
 alias geothings-test='ssh geothings@test.geothings.tw'
 alias demo='ssh -i ~/.ssh/ec2-nlsc-tileservice.pem ubuntu@demo.geosurvey.io'
+alias demo2='ssh -i ~/.ssh/ec2-nlsc-tileservice.pem ubuntu@dev.geosurvey.io'
+alias cool='ssh pham@10.0.0.2'
 
 # Android
 alias debug='./gradlew app:installDebug && adb shell am start -n com.geothings.geobingan/.MainActivity_'
@@ -367,7 +369,6 @@ alias cdtrash='cd ~/.local/share/Trash'
 trash() {
     mv $@ ~/.local/share/Trash
 }
-transfer(){ if [ $# -eq 0 ];then echo "No arguments specified.\nUsage:\n  transfer <file|directory>\n  ... | transfer <file_name>">&2;return 1;fi;if tty -s;then file="$1";file_name=$(basename "$file");if [ ! -e "$file" ];then echo "$file: No such file or directory">&2;return 1;fi;if [ -d "$file" ];then file_name="$file_name.zip" ,;(cd "$file"&&zip -r -q - .)|curl --progress-bar --upload-file "-" "https://topo.tw/up/$file_name"|tee /dev/null,;else cat "$file"|curl --progress-bar --upload-file "-" "https://topo.tw/up/$file_name"|tee /dev/null;fi;else file_name=$1;curl --progress-bar --upload-file "-" "https://topo.tw/up/$file_name"|tee /dev/null;fi;}
 
 # task
 alias tk='task'
diff --git a/tools/misc/transfer.sh b/tools/misc/transfer.sh
new file mode 100755
index 0000000..41fa6c9
--- /dev/null
+++ b/tools/misc/transfer.sh
@@ -0,0 +1,22 @@
+#! /bin/env sh
+
+if [ $# -eq 0 ];then
+  echo "No arguments specified.\nUsage:\n  transfer <file|directory>\n  ... | transfer <file_name>">&2;
+  return 1;
+fi;
+if tty -s; then
+  file="$1"; file_name=$(basename "$file");
+  if [ ! -e "$file" ]; then
+    echo "$file: No such file or directory">&2;
+    return 1;
+  fi;
+  if [ -d "$file" ];then
+    file_name="$file_name.zip" ,;
+    (cd "$file" && zip -r -q - .) | curl --progress-bar --upload-file "-" "https://topo.tw/up/$file_name" | tee /dev/null,;
+  else
+    cat "$file" | curl --progress-bar --upload-file "-" "https://topo.tw/up/$file_name" | tee /dev/null;
+  fi;
+else
+  file_name=$1;
+  curl --progress-bar --upload-file "-" "https://topo.tw/up/$file_name" | tee /dev/null;
+fi;