From 50447bdf4d3dba214f29899bd00a0a52ec859a13 Mon Sep 17 00:00:00 2001 From: Hsieh Chin Fan Date: Sat, 7 Aug 2021 21:28:33 +0800 Subject: index on dev: ad78fb0 Merge remote-tracking branch 'origin/dev' into dev --- alias | 4 ++-- tools/misc/transfer | 22 ++++++++++++++++++++++ tools/misc/transfer.sh | 22 ---------------------- 3 files changed, 24 insertions(+), 24 deletions(-) create mode 100755 tools/misc/transfer delete mode 100755 tools/misc/transfer.sh diff --git a/alias b/alias index 8cfd0d3..a8ed045 100644 --- a/alias +++ b/alias @@ -218,8 +218,8 @@ alias cdssh='cd ~/.ssh' 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 demo='ssh demo.geosurvey.io' +alias demo2='ssh dev.geosurvey.io' alias cool='ssh pham@10.0.0.2' # Android diff --git a/tools/misc/transfer b/tools/misc/transfer new file mode 100755 index 0000000..41fa6c9 --- /dev/null +++ b/tools/misc/transfer @@ -0,0 +1,22 @@ +#! /bin/env sh + +if [ $# -eq 0 ];then + echo "No arguments specified.\nUsage:\n transfer \n ... | transfer ">&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; diff --git a/tools/misc/transfer.sh b/tools/misc/transfer.sh deleted file mode 100755 index 41fa6c9..0000000 --- a/tools/misc/transfer.sh +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/env sh - -if [ $# -eq 0 ];then - echo "No arguments specified.\nUsage:\n transfer \n ... | transfer ">&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; -- cgit v1.2.3-70-g09d2