3 Commits
1.4.2 ... 1.6.1

Author SHA1 Message Date
fbt
af0b52e575 always remove temporary files 2015-10-13 13:57:56 +03:00
fbt
1809fde7c9 use XDG! 2015-10-13 13:52:26 +03:00
fbt
e3d642a730 /ip support 2015-10-12 17:59:33 +03:00
2 changed files with 30 additions and 5 deletions

28
sup
View File

@@ -6,8 +6,13 @@
_self="${0##*/}"
# Defaults for XDG
if ! [[ "$XDG_RUNTIME_DIR" ]]; then
XDG_RUNTIME_DIR="/run/user/$UID"
fi
cfg_url_regex='^[A-Za-z]([A-Za-z0-9+.-]+)?://.+'
cfg_tmp_dir="/tmp/$USER/sup"; TEMPDIR="$cfg_tmp_dir"
cfg_tmp_dir="$XDG_RUNTIME_DIR/sup"; TEMPDIR="$cfg_tmp_dir"
cfg_service_url='https://zfh.so'
cfg_screenshot_ext='png'
@@ -19,6 +24,10 @@ _cat() {
done
}
is_url() {
[[ "$1" =~ $cfg_url_regex ]]
}
sup.msg() { printf '%s\n' "[sup] $1"; }
sup.err() { sup.msg "(error) $1" >&2; }
@@ -56,6 +65,7 @@ sup.get_hash() {
sup.upload() {
if (( flag_scrot )); then
flag_rm=1
file=$(sup.scrot) || { return 1; }
else
(( $# )) || {
@@ -65,7 +75,8 @@ sup.upload() {
target="$1"
if sup.if_url "$target"; then
if is_url "$target"; then
flag_rm=1
file=$(sup.mktemp "$cfg_tmp_dir")
curl -skL "$target" > "$file" || {
@@ -150,8 +161,6 @@ sup.scrot() {
printf '%s\n' "$tmp_file"
}
sup.if_url() { printf '%s\n' "$1" | grep -oE "$cfg_url_regex" &>/dev/null; }
sup.mktemp() {
declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1"
@@ -167,6 +176,14 @@ sup.mktemp() {
printf '%s\n' "${tmp_dir}/${tmp_file_name}"
}
sup.get_my_ip() {
my_ip=$( curl -fsL https://zfh.so/ip )
if ! (( $? )); then
printf '%s\n' $my_ip
fi
}
sup.set_argv() {
declare arg opt c
declare -g argv
@@ -219,6 +236,8 @@ main() {
flag_scrot_fullscreen='1'
;;
-i|--my-ip) action='getmyip';;
-S|--short) flag_shortlink='1';;
-u|--url) action='url';;
@@ -236,6 +255,7 @@ main() {
case "${action:-upload}" in
upload) sup.upload "$1";;
url) sup.url "$1";;
getmyip) sup.get_my_ip;;
esac
}

7
supd
View File

@@ -1,8 +1,13 @@
#!/usr/bin/env bash
shopt -s nullglob
# Defaults for XDG
if ! [[ "$XDG_RUNTIME_DIR" ]]; then
XDG_RUNTIME_DIR="/run/user/$UID"
fi
# Defaults
cfg_workdir="/tmp/$USER/supd"
cfg_workdir="$XDG_RUNTIME_DIR/supd"
cfg_scan_delay='30'
msg() { printf '%s\n' "$*"; }